diff --git a/dist/moon.js b/dist/moon.js
index 611799c3..13664532 100644
--- a/dist/moon.js
+++ b/dist/moon.js
@@ -68,7 +68,7 @@
     stack[stack.length - 1].children.push(child);
   };
 
-  var parseAttributes = function (index, input, length, stack, dependencies, attributes) {
+  var parseAttributes = function (index, input, length, dependencies, attributes) {
     while (index < length) {
       var char = input[index];
 
@@ -127,30 +127,12 @@
           }
         }
 
-        var first = key[0];
-        if (first === "#") {
-          var element = {
-            index: stack[0].nextIndex++,
-            type: key,
-            attributes: [{
-              key: "",
-              value: value,
-              expression: expression,
-              dynamic: expression && parseTemplate(value, dependencies)
-            }],
-            children: []
-          };
-
-          pushChild(element, stack);
-          stack.push(element);
-        } else {
-          attributes.push({
-            key: key,
-            value: value,
-            expression: expression,
-            dynamic: expression && parseTemplate(value, dependencies)
-          });
-        }
+        attributes.push({
+          key: key,
+          value: value,
+          expression: expression,
+          dynamic: expression && parseTemplate(value, dependencies)
+        });
       }
     }
 
@@ -158,19 +140,38 @@
   };
 
   var parseOpeningTag = function (index, input, length, stack, dependencies) {
-    var type = "";
-    var attributes = [];
+    var element = {
+      index: stack[0].nextIndex++,
+      type: "",
+      attributes: [],
+      children: []
+    };
 
     while (index < length) {
       var char = input[index];
 
       if (char === ">") {
-        var element = {
-          index: stack[0].nextIndex++,
-          type: type,
-          attributes: attributes,
-          children: []
-        };
+        var attributes = element.attributes;
+        for (var i = 0; i < attributes.length;) {
+          var attribute = attributes[i];
+          if (attribute.key[0] === "#") {
+            element = {
+              index: stack[0].nextIndex++,
+              type: attribute.key,
+              attributes: [{
+                key: "",
+                value: attribute.value,
+                expression: attribute.expression,
+                dynamic: attribute.dynamic
+              }],
+              children: [element]
+            };
+            pushChild(element, stack);
+            attributes.splice(i, 1);
+          } else {
+            i += 1;
+          }
+        }
 
         pushChild(element, stack);
         stack.push(element);
@@ -178,20 +179,14 @@
         index += 1;
         break;
       } else if (char === "/" && input[index + 1] === ">") {
-        pushChild({
-          index: stack[0].nextIndex++,
-          type: type,
-          attributes: attributes,
-          children: []
-        }, stack);
+        pushChild(element, stack);
 
         index += 2;
         break;
       } else if ((whitespaceRE.test(char) && (index += 1)) || char === "=") {
-        attributes = [];
-        index = parseAttributes(index, input, length, stack, dependencies, attributes);
+        index = parseAttributes(index, input, length, dependencies, element.attributes);
       } else {
-        type += char;
+        element.type += char;
         index += 1;
       }
     }
@@ -301,7 +296,6 @@
       nextIndex: 1,
       type: "#root",
       attributes: [],
-      events: [],
       children: [],
       dependencies: dependencies
     };
@@ -339,6 +333,8 @@
 
   var createTextNode = function (content) { return ("m.ctn(" + content + ");"); };
 
+  var createComment = function () { return "m.cc();"; };
+
   var attributeValue = function (attribute) { return attribute.expression ? attribute.value : ("\"" + (attribute.value) + "\""); };
 
   var setAttribute = function (element, attribute) { return ("m.sa(" + (getElement(element)) + ",\"" + (attribute.key) + "\"," + (attributeValue(attribute)) + ");"); };
@@ -351,14 +347,26 @@
 
   var removeChild = function (element, parent) { return ("m.rc(" + (getElement(element)) + "," + (getElement(parent)) + ");"); };
 
-  var generateCreate = function (element, parent, root) {
+  var insertBefore = function (element, reference, parent) { return ("m.ib(" + (getElement(element)) + "," + (getElement(reference)) + "," + (getElement(parent)) + ");"); };
+
+  var generateCreate = function (element, parent, root, insert) {
+    var createCode;
     switch (element.type) {
+      case "#if":
+        var ifCreate = element.ifCreate = root.nextIndex++;
+        return setElement(element.index, createComment()) + appendChild(element.index, parent.index) + setElement(ifCreate, ("function(){" + (mapReduce(element.children, function (child) { return generateCreate(child, parent, root, element.index); })) + "};")) + "if(" + (attributeValue(element.attributes[0])) + "){" + (getElement(ifCreate)) + "();}";
+        break;
+      case "#else":
+        var elseCreate = element.elseCreate = root.nextIndex++;
+        return ("else{" + (getElement(elseCreate)) + "();}" + (setElement(elseCreate, ("function(){" + (mapReduce(element.children, function (child) { return generateCreate(child, parent, root, element.index - 1); })) + "};"))));
       case "#text":
-        return setElement(element.index, createTextNode(attributeValue(element.attributes[0]))) + appendChild(element.index, parent.index);
+        createCode = setElement(element.index, createTextNode(attributeValue(element.attributes[0])));
         break;
       default:
-        return setElement(element.index, createElement(element.type)) + mapReduce(element.attributes, function (attribute) { return attribute.key[0] === "@" ? addEventListener(element.index, attribute) : setAttribute(element.index, attribute); }) + mapReduce(element.children, function (child) { return generateCreate(child, element, root); }) + appendChild(element.index, parent.index);
+        createCode = setElement(element.index, createElement(element.type)) + mapReduce(element.attributes, function (attribute) { return attribute.key[0] === "@" ? addEventListener(element.index, attribute) : setAttribute(element.index, attribute); }) + mapReduce(element.children, function (child) { return generateCreate(child, element, root); });
     }
+
+    return createCode + (insert === undefined ? appendChild(element.index, parent.index) : insertBefore(element.index, insert, parent.index));
   };
 
   var generateUpdate = function (element, parent, root) {
@@ -417,8 +425,8 @@
     parent.removeChild(element);
   };
 
-  var replaceChild$1 = function (element, old, parent) {
-    parent.replaceChild(element, old);
+  var insertBefore$1 = function (element, reference, parent) {
+    parent.insertBefore(element, reference);
   };
 
   var m = function () {
@@ -432,7 +440,7 @@
     m.stc = setTextContent$1;
     m.ac = appendChild$1;
     m.rc = removeChild$1;
-    m.pc = replaceChild$1;
+    m.ib = insertBefore$1;
     return m;
   };
 
diff --git a/dist/moon.min.js b/dist/moon.min.js
index 6c794e58..8d9ffff9 100644
--- a/dist/moon.min.js
+++ b/dist/moon.min.js
@@ -4,4 +4,4 @@
  * Released under the MIT License
  * https://kbrsh.github.io/moon
  */
-!function(t,e){"undefined"==typeof module?t.Moon=e():module.exports=e()}(this,function(){"use strict";var a=function(t,e,n){for(;t<n;){var i=e[t],r=e[t+1],u=e[t+2];if("<"===i&&"!"===r&&"-"===u&&"-"===e[t+3])t=a(t+4,e,n);else{if("-"===i&&"-"===r&&">"===u){t+=3;break}t+=1}}return t},u=/"[^"]*"|'[^']*'|\d+[a-zA-Z$_]\w*|\.[a-zA-Z$_]\w*|[a-zA-Z$_]\w*:|([a-zA-Z$_]\w*)/g,o=["NaN","event","false","in","m","null","this","true","typeof","undefined"],v=function(t,e){for(var n,i=!1;null!==(n=u.exec(t));){var r=n[1];void 0!==r&&-1===o.indexOf(r)&&"$"!==r[0]&&(i=!0,-1===e.indexOf(r)&&e.push(r))}return i},t={silent:!0},h=/\s+/,l=function(t,e){e[e.length-1].children.push(t)},f=function(t,e,n,i,r,u){for(;t<n;){var o=e[t];if("/"===o||">"===o)break;if(h.test(o))t+=1;else{for(var a="",c="",f=!1;t<n;){if("/"===(o=e[t])||">"===o||h.test(o)){c=a;break}if("="===o){t+=1;break}a+=o,t+=1}if(0===c.length){var d=void 0;for('"'===(o=e[t])||"'"===o?(d=o,t+=1):"{"===o?(d="}",f=!0,t+=1):d=h;t<n&&"/"!==(o=e[t])&&">"!==o;){if("object"==typeof d&&d.test(o)||o===d){t+=1;break}c+=o,t+=1}}if("#"===a[0]){var s={index:i[0].nextIndex++,type:a,attributes:[{key:"",value:c,expression:f,dynamic:f&&v(c,r)}],children:[]};l(s,i),i.push(s)}else u.push({key:a,value:c,expression:f,dynamic:f&&v(c,r)})}}return t},c=function(t,e,n,i,r){for(var u="",o=[];t<n;){var a=e[t];if(">"===a){var c={index:i[0].nextIndex++,type:u,attributes:o,children:[]};l(c,i),i.push(c),t+=1;break}if("/"===a&&">"===e[t+1]){l({index:i[0].nextIndex++,type:u,attributes:o,children:[]},i),t+=2;break}h.test(a)&&(t+=1)||"="===a?t=f(t,e,n,i,r,o=[]):(u+=a,t+=1)}return t},d=function(t,e,n,i){for(;t<n;t++){var r=e[t];if(">"===r){t+=1;break}r}var u=i.pop();return u.type,t},s=/(?:(?:&(?:amp|gt|lt|nbsp|quot);)|"|\\|\n)/g,p={"&amp;":"&","&gt;":">","&lt;":"<","&nbsp;":" ","&quot;":'\\"',"\\":"\\\\",'"':'\\"',"\n":"\\n"},m=function(t,e,n,i){for(var r="";t<n;t++){var u=e[t];if("<"===u||"{"===u)break;r+=u}return h.test(r)||l({index:i[0].nextIndex++,type:"#text",attributes:[{key:"",value:r.replace(s,function(t){return p[t]}),expression:!1,dynamic:!1}],children:[]},i),t},x=function(t,e,n,i,r){for(var u="";t<n;t++){var o=e[t];if("}"===o){t+=1;break}u+=o}return l({index:i[0].nextIndex++,type:"#text",attributes:[{key:"",value:u,expression:!0,dynamic:v(u,r)}],children:[]},i),t},y=function(t,n){return t.reduce(function(t,e){return t+n(e)},"")},b=function(t){return"m["+t+"]"},n=function(t,e){return b(t)+"="+e},r=function(t){return t.expression?t.value:'"'+t.value+'"'},k=function(t,e){return"m.sa("+b(t)+',"'+e.key+'",'+r(e)+");"},w=function(t,e){return"m.ac("+b(t)+","+b(e)+");"},g=function(i,t,e){switch(i.type){case"#text":return n(i.index,"m.ctn("+r(i.attributes[0])+");")+w(i.index,t.index);default:return n(i.index,'m.ce("'+i.type+'");')+y(i.attributes,function(t){return"@"===t.key[0]?(e=i.index,n=t,"m.ael("+b(e)+',"'+n.key.substring(1)+'",function($event){'+r(n)+"});"):k(i.index,t);var e,n})+y(i.children,function(t){return g(t,i,e)})+w(i.index,t.index)}},q=function(e,t,n){switch(e.type){case"#text":var i=e.attributes[0];return i.dynamic?(r=e.index,u=i.value,"m.stc("+b(r)+","+u+");"):"";default:return y(e.attributes,function(t){return"@"!==t.key[0]&&t.dynamic?k(e.index,t):""})+y(e.children,function(t){return q(t,e,n)})}var r,u},i=function(t,e,n){return i=t.index,r=e.index,"m.rc("+b(i)+","+b(r)+");";var i,r},I=function(t){return e=function(t){for(var e=t.length,n=[],i={index:0,nextIndex:1,type:"#root",attributes:[],events:[],children:[],dependencies:n},r=[i],u=0;u<e;){var o=t[u];u="<"===o?"!"===t[u+1]&&"-"===t[u+2]&&"-"===t[u+3]?a(u+4,t,e):"/"===t[u+1]?d(u+2,t,e,r):c(u+1,t,e,r,n):"{"===o?x(u+1,t,e,r,n):m(u,t,e,r)}return i}(t),n=y(e.dependencies,function(t){return"var "+t+"=this.data."+t+";"}),new Function("return [function(m){this.m[0]=m;m=this.m;"+n+y(e.children,function(t){return g(t,e,e)})+"},function(){var m=this.m;"+n+y(e.children,function(t){return q(t,e,e)})+"},function(){var m=this.m;"+y(e.children,function(t){return i(t,e)})+"m=[m[0]];}];")();var e,n},$={},A=function(t){return document.createElement(t)},C=function(t){return document.createTextNode(t)},z=function(){return document.createComment("")},Z=function(t,e,n){t.setAttribute(e,n)},_=function(t,e,n){t.addEventListener(e,n)},j=function(t,e){t.textContent=e},N=function(t,e){e.appendChild(t)},O=function(t,e){e.removeChild(t)},E=function(t,e,n){n.replaceChild(t,e)},T=function(t){this.view[0](t),this.emit("created")},F=function(){if(!1===this.queued){this.queued=!0;var t=this;setTimeout(function(){t.view[1](),t.queued=!1,t.emit("updated")},0)}},L=function(){this.view[2](),this.emit("destroyed")},M=function(t,e){if("object"==typeof t)for(var n in t)this.set(n,t[n]);else this.data[t]=e,this.update()},S=function(t,e){var n=this.data,i=n[t];void 0===i?n[t]=e:"function"==typeof i?n[t]=[i,e]:i.push(e)},B=function(t,e){if(void 0===e)this.data[t]=[];else{var n=this.data,i=n[t];"function"==typeof i?n[t]=void 0:i.splice(i.indexOf(e),1)}},D=function(t,e){var n=this.data[t];if(void 0!==n)if("function"==typeof n)n(e);else for(var i=0;i<n.length;i++)n[i](e)},G=function(u,o){return function(){var t,e=this;this.name=u,this.view=o.view.map(function(t){return t.bind(e)}),this.m=((t=[]).c=$,t.ce=A,t.ctn=C,t.cc=z,t.sa=Z,t.ael=_,t.stc=j,t.ac=N,t.rc=O,t.pc=E,t);var n=this.data=o.data(),i=o.actions;for(var r in i)n[r]=i[r].bind(e);this.queued=!1,this.create=T,this.update=F,this.destroy=L,this.set=M,this.on=S,this.off=B,this.emit=D}};function e(t){var e=t.root;"string"==typeof e&&(e=document.querySelector(e));var n=t.view;"string"==typeof n&&(t.view=I(n));var i=t.data;void 0===i?t.data=function(){return{}}:"object"==typeof i&&(t.data=function(){return i}),void 0===t.actions&&(t.actions={});var r=new(G("#m",t));return r.create(e),r}return e.extend=function(t,e){var n=e.view;"string"==typeof n&&(e.view=I(n)),void 0===e.data&&(e.data=function(){return{}}),void 0===e.actions&&(e.actions={}),$[t]=G(t,e)},e.compile=I,e.config=t,e});
\ No newline at end of file
+!function(e,t){"undefined"==typeof module?e.Moon=t():module.exports=t()}(this,function(){"use strict";var o=function(e,t,n){for(;e<n;){var i=t[e],r=t[e+1],u=t[e+2];if("<"===i&&"!"===r&&"-"===u&&"-"===t[e+3])e=o(e+4,t,n);else{if("-"===i&&"-"===r&&">"===u){e+=3;break}e+=1}}return e},u=/"[^"]*"|'[^']*'|\d+[a-zA-Z$_]\w*|\.[a-zA-Z$_]\w*|[a-zA-Z$_]\w*:|([a-zA-Z$_]\w*)/g,a=["NaN","event","false","in","m","null","this","true","typeof","undefined"],s=function(e,t){for(var n,i=!1;null!==(n=u.exec(e));){var r=n[1];void 0!==r&&-1===a.indexOf(r)&&"$"!==r[0]&&(i=!0,-1===t.indexOf(r)&&t.push(r))}return i},e={silent:!0},d=/\s+/,v=function(e,t){t[t.length-1].children.push(e)},h=function(e,t,n,i,r){for(;e<n;){var u=t[e];if("/"===u||">"===u)break;if(d.test(u))e+=1;else{for(var a="",o="",c=!1;e<n;){if("/"===(u=t[e])||">"===u||d.test(u)){o=a;break}if("="===u){e+=1;break}a+=u,e+=1}if(0===o.length){var f=void 0;for('"'===(u=t[e])||"'"===u?(f=u,e+=1):"{"===u?(f="}",c=!0,e+=1):f=d;e<n&&"/"!==(u=t[e])&&">"!==u;){if("object"==typeof f&&f.test(u)||u===f){e+=1;break}o+=u,e+=1}}r.push({key:a,value:o,expression:c,dynamic:c&&s(o,i)})}}return e},c=function(e,t,n,i,r){for(var u={index:i[0].nextIndex++,type:"",attributes:[],children:[]};e<n;){var a=t[e];if(">"===a){for(var o=u.attributes,c=0;c<o.length;){var f=o[c];"#"===f.key[0]?(u={index:i[0].nextIndex++,type:f.key,attributes:[{key:"",value:f.value,expression:f.expression,dynamic:f.dynamic}],children:[u]},v(u,i),o.splice(c,1)):c+=1}v(u,i),i.push(u),e+=1;break}if("/"===a&&">"===t[e+1]){v(u,i),e+=2;break}d.test(a)&&(e+=1)||"="===a?e=h(e,t,n,r,u.attributes):(u.type+=a,e+=1)}return e},f=function(e,t,n,i){for(;e<n;e++){var r=t[e];if(">"===r){e+=1;break}r}var u=i.pop();return u.type,e},l=/(?:(?:&(?:amp|gt|lt|nbsp|quot);)|"|\\|\n)/g,x={"&amp;":"&","&gt;":">","&lt;":"<","&nbsp;":" ","&quot;":'\\"',"\\":"\\\\",'"':'\\"',"\n":"\\n"},m=function(e,t,n,i){for(var r="";e<n;e++){var u=t[e];if("<"===u||"{"===u)break;r+=u}return d.test(r)||v({index:i[0].nextIndex++,type:"#text",attributes:[{key:"",value:r.replace(l,function(e){return x[e]}),expression:!1,dynamic:!1}],children:[]},i),e},p=function(e,t,n,i,r){for(var u="";e<n;e++){var a=t[e];if("}"===a){e+=1;break}u+=a}return v({index:i[0].nextIndex++,type:"#text",attributes:[{key:"",value:u,expression:!0,dynamic:s(u,r)}],children:[]},i),e},y=function(e,n){return e.reduce(function(e,t){return e+n(t)},"")},b=function(e){return"m["+e+"]"},k=function(e,t){return b(e)+"="+t},w=function(e){return e.expression?e.value:'"'+e.value+'"'},g=function(e,t){return"m.sa("+b(e)+',"'+t.key+'",'+w(t)+");"},q=function(e,t){return"m.ac("+b(e)+","+b(t)+");"},I=function(i,t,n,e){var r,u,a,o;switch(i.type){case"#if":var c=i.ifCreate=n.nextIndex++;return k(i.index,"m.cc();")+q(i.index,t.index)+k(c,"function(){"+y(i.children,function(e){return I(e,t,n,i.index)})+"};")+"if("+w(i.attributes[0])+"){"+b(c)+"();}";case"#else":var f=i.elseCreate=n.nextIndex++;return"else{"+b(f)+"();}"+k(f,"function(){"+y(i.children,function(e){return I(e,t,n,i.index-1)})+"};");case"#text":r=k(i.index,"m.ctn("+w(i.attributes[0])+");");break;default:r=k(i.index,'m.ce("'+i.type+'");')+y(i.attributes,function(e){return"@"===e.key[0]?(t=i.index,n=e,"m.ael("+b(t)+',"'+n.key.substring(1)+'",function($event){'+w(n)+"});"):g(i.index,e);var t,n})+y(i.children,function(e){return I(e,i,n)})}return r+(void 0===e?q(i.index,t.index):(u=i.index,a=e,o=t.index,"m.ib("+b(u)+","+b(a)+","+b(o)+");"))},C=function(t,e,n){switch(t.type){case"#text":var i=t.attributes[0];return i.dynamic?(r=t.index,u=i.value,"m.stc("+b(r)+","+u+");"):"";default:return y(t.attributes,function(e){return"@"!==e.key[0]&&e.dynamic?g(t.index,e):""})+y(t.children,function(e){return C(e,t,n)})}var r,u},i=function(e,t,n){return i=e.index,r=t.index,"m.rc("+b(i)+","+b(r)+");";var i,r},$=function(e){return t=function(e){for(var t=e.length,n=[],i={index:0,nextIndex:1,type:"#root",attributes:[],children:[],dependencies:n},r=[i],u=0;u<t;){var a=e[u];u="<"===a?"!"===e[u+1]&&"-"===e[u+2]&&"-"===e[u+3]?o(u+4,e,t):"/"===e[u+1]?f(u+2,e,t,r):c(u+1,e,t,r,n):"{"===a?p(u+1,e,t,r,n):m(u,e,t,r)}return i}(e),n=y(t.dependencies,function(e){return"var "+e+"=this.data."+e+";"}),new Function("return [function(m){this.m[0]=m;m=this.m;"+n+y(t.children,function(e){return I(e,t,t)})+"},function(){var m=this.m;"+n+y(t.children,function(e){return C(e,t,t)})+"},function(){var m=this.m;"+y(t.children,function(e){return i(e,t)})+"m=[m[0]];}];")();var t,n},A={},z=function(e){return document.createElement(e)},Z=function(e){return document.createTextNode(e)},_=function(){return document.createComment("")},j=function(e,t,n){e.setAttribute(t,n)},N=function(e,t,n){e.addEventListener(t,n)},O=function(e,t){e.textContent=t},E=function(e,t){t.appendChild(e)},T=function(e,t){t.removeChild(e)},B=function(e,t,n){n.insertBefore(e,t)},F=function(e){this.view[0](e),this.emit("created")},L=function(){if(!1===this.queued){this.queued=!0;var e=this;setTimeout(function(){e.view[1](),e.queued=!1,e.emit("updated")},0)}},M=function(){this.view[2](),this.emit("destroyed")},S=function(e,t){if("object"==typeof e)for(var n in e)this.set(n,e[n]);else this.data[e]=t,this.update()},D=function(e,t){var n=this.data,i=n[e];void 0===i?n[e]=t:"function"==typeof i?n[e]=[i,t]:i.push(t)},G=function(e,t){if(void 0===t)this.data[e]=[];else{var n=this.data,i=n[e];"function"==typeof i?n[e]=void 0:i.splice(i.indexOf(t),1)}},H=function(e,t){var n=this.data[e];if(void 0!==n)if("function"==typeof n)n(t);else for(var i=0;i<n.length;i++)n[i](t)},J=function(u,a){return function(){var e,t=this;this.name=u,this.view=a.view.map(function(e){return e.bind(t)}),this.m=((e=[]).c=A,e.ce=z,e.ctn=Z,e.cc=_,e.sa=j,e.ael=N,e.stc=O,e.ac=E,e.rc=T,e.ib=B,e);var n=this.data=a.data(),i=a.actions;for(var r in i)n[r]=i[r].bind(t);this.queued=!1,this.create=F,this.update=L,this.destroy=M,this.set=S,this.on=D,this.off=G,this.emit=H}};function t(e){var t=e.root;"string"==typeof t&&(t=document.querySelector(t));var n=e.view;"string"==typeof n&&(e.view=$(n));var i=e.data;void 0===i?e.data=function(){return{}}:"object"==typeof i&&(e.data=function(){return i}),void 0===e.actions&&(e.actions={});var r=new(J("#m",e));return r.create(t),r}return t.extend=function(e,t){var n=t.view;"string"==typeof n&&(t.view=$(n)),void 0===t.data&&(t.data=function(){return{}}),void 0===t.actions&&(t.actions={}),A[e]=J(e,t)},t.compile=$,t.config=e,t});
\ No newline at end of file
diff --git a/src/compiler/generator/create.js b/src/compiler/generator/create.js
index 892d53bf..ff763e9f 100644
--- a/src/compiler/generator/create.js
+++ b/src/compiler/generator/create.js
@@ -1,11 +1,21 @@
-import { mapReduce, setElement, createElement, createTextNode, attributeValue, setAttribute, addEventListener, appendChild } from "./util";
+import { mapReduce, getElement, setElement, createElement, createTextNode, createComment, attributeValue, setAttribute, addEventListener, appendChild, insertBefore } from "./util";
 
-export const generateCreate = (element, parent, root) => {
+export const generateCreate = (element, parent, root, insert) => {
+  let createCode;
   switch (element.type) {
+    case "#if":
+      const ifCreate = element.ifCreate = root.nextIndex++;
+      return setElement(element.index, createComment()) + appendChild(element.index, parent.index) + setElement(ifCreate, `function(){${mapReduce(element.children, (child) => generateCreate(child, parent, root, element.index))}};`) + `if(${attributeValue(element.attributes[0])}){${getElement(ifCreate)}();}`;
+      break;
+    case "#else":
+      const elseCreate = element.elseCreate = root.nextIndex++;
+      return `else{${getElement(elseCreate)}();}${setElement(elseCreate, `function(){${mapReduce(element.children, (child) => generateCreate(child, parent, root, element.index - 1))}};`)}`;
     case "#text":
-      return setElement(element.index, createTextNode(attributeValue(element.attributes[0]))) + appendChild(element.index, parent.index);
+      createCode = setElement(element.index, createTextNode(attributeValue(element.attributes[0])));
       break;
     default:
-      return setElement(element.index, createElement(element.type)) + mapReduce(element.attributes, (attribute) => attribute.key[0] === "@" ? addEventListener(element.index, attribute) : setAttribute(element.index, attribute)) + mapReduce(element.children, (child) => generateCreate(child, element, root)) + appendChild(element.index, parent.index);
+      createCode = setElement(element.index, createElement(element.type)) + mapReduce(element.attributes, (attribute) => attribute.key[0] === "@" ? addEventListener(element.index, attribute) : setAttribute(element.index, attribute)) + mapReduce(element.children, (child) => generateCreate(child, element, root));
   }
+
+  return createCode + (insert === undefined ? appendChild(element.index, parent.index) : insertBefore(element.index, insert, parent.index));
 };
diff --git a/src/compiler/generator/util.js b/src/compiler/generator/util.js
index 143197e3..870ad0ce 100644
--- a/src/compiler/generator/util.js
+++ b/src/compiler/generator/util.js
@@ -22,4 +22,4 @@ export const appendChild = (element, parent) => `m.ac(${getElement(element)},${g
 
 export const removeChild = (element, parent) => `m.rc(${getElement(element)},${getElement(parent)});`;
 
-export const replaceChild = (element, old, parent) => `m.pc(${getElement(element)},${getElement(old)},${getElement(parent)});`;
+export const insertBefore = (element, reference, parent) => `m.ib(${getElement(element)},${getElement(reference)},${getElement(parent)});`;
diff --git a/src/compiler/parser/parser.js b/src/compiler/parser/parser.js
index 54adb4de..37822aa6 100644
--- a/src/compiler/parser/parser.js
+++ b/src/compiler/parser/parser.js
@@ -12,7 +12,6 @@ export const parse = (input) => {
     nextIndex: 1,
     type: "#root",
     attributes: [],
-    events: [],
     children: [],
     dependencies: dependencies
   };
diff --git a/src/compiler/parser/tag.js b/src/compiler/parser/tag.js
index d0b7bc32..dd937645 100644
--- a/src/compiler/parser/tag.js
+++ b/src/compiler/parser/tag.js
@@ -1,7 +1,7 @@
 import { parseTemplate } from "./template";
 import { whitespaceRE, error, pushChild } from "./util";
 
-const parseAttributes = (index, input, length, stack, dependencies, attributes) => {
+const parseAttributes = (index, input, length, dependencies, attributes) => {
   while (index < length) {
     let char = input[index];
 
@@ -60,30 +60,12 @@ const parseAttributes = (index, input, length, stack, dependencies, attributes)
         }
       }
 
-      const first = key[0];
-      if (first === "#") {
-        const element = {
-          index: stack[0].nextIndex++,
-          type: key,
-          attributes: [{
-            key: "",
-            value: value,
-            expression: expression,
-            dynamic: expression && parseTemplate(value, dependencies)
-          }],
-          children: []
-        };
-
-        pushChild(element, stack);
-        stack.push(element);
-      } else {
-        attributes.push({
-          key: key,
-          value: value,
-          expression: expression,
-          dynamic: expression && parseTemplate(value, dependencies)
-        });
-      }
+      attributes.push({
+        key: key,
+        value: value,
+        expression: expression,
+        dynamic: expression && parseTemplate(value, dependencies)
+      });
     }
   }
 
@@ -91,19 +73,38 @@ const parseAttributes = (index, input, length, stack, dependencies, attributes)
 };
 
 export const parseOpeningTag = (index, input, length, stack, dependencies) => {
-  let type = "";
-  let attributes = [];
+  let element = {
+    index: stack[0].nextIndex++,
+    type: "",
+    attributes: [],
+    children: []
+  };
 
   while (index < length) {
     const char = input[index];
 
     if (char === ">") {
-      const element = {
-        index: stack[0].nextIndex++,
-        type: type,
-        attributes: attributes,
-        children: []
-      };
+      const attributes = element.attributes;
+      for (let i = 0; i < attributes.length;) {
+        const attribute = attributes[i];
+        if (attribute.key[0] === "#") {
+          element = {
+            index: stack[0].nextIndex++,
+            type: attribute.key,
+            attributes: [{
+              key: "",
+              value: attribute.value,
+              expression: attribute.expression,
+              dynamic: attribute.dynamic
+            }],
+            children: [element]
+          };
+          pushChild(element, stack);
+          attributes.splice(i, 1);
+        } else {
+          i += 1;
+        }
+      }
 
       pushChild(element, stack);
       stack.push(element);
@@ -111,20 +112,14 @@ export const parseOpeningTag = (index, input, length, stack, dependencies) => {
       index += 1;
       break;
     } else if (char === "/" && input[index + 1] === ">") {
-      pushChild({
-        index: stack[0].nextIndex++,
-        type: type,
-        attributes: attributes,
-        children: []
-      }, stack);
+      pushChild(element, stack);
 
       index += 2;
       break;
     } else if ((whitespaceRE.test(char) && (index += 1)) || char === "=") {
-      attributes = [];
-      index = parseAttributes(index, input, length, stack, dependencies, attributes);
+      index = parseAttributes(index, input, length, dependencies, element.attributes);
     } else {
-      type += char;
+      element.type += char;
       index += 1;
     }
   }
diff --git a/src/util/m.js b/src/util/m.js
index 7fb821a4..e38e8298 100644
--- a/src/util/m.js
+++ b/src/util/m.js
@@ -26,8 +26,8 @@ const removeChild = (element, parent) => {
   parent.removeChild(element);
 };
 
-const replaceChild = (element, old, parent) => {
-  parent.replaceChild(element, old);
+const insertBefore = (element, reference, parent) => {
+  parent.insertBefore(element, reference);
 };
 
 export const m = () => {
@@ -41,6 +41,6 @@ export const m = () => {
   m.stc = setTextContent;
   m.ac = appendChild;
   m.rc = removeChild;
-  m.pc = replaceChild;
+  m.ib = insertBefore;
   return m;
 };