diff --git a/dist/system-production-amd.js b/dist/system-production-amd.js
index 6861fb28..c4a56fc4 100644
--- a/dist/system-production-amd.js
+++ b/dist/system-production-amd.js
@@ -316,12 +316,20 @@ function register(loader) {
       // now we know the entry is in our unlinked linkage group
       var depGroupIndex = entry.groupIndex + (depEntry.declarative != entry.declarative);
 
-      if (depEntry.groupIndex === undefined) {
+      // the group index of an entry is always the maximum
+      if (depEntry.groupIndex === undefined || depEntry.groupIndex < depGroupIndex) {
+        
+        // if already in a group, remove from the old group
+        if (depEntry.groupIndex) {
+          groups[depEntry.groupIndex].splice(groups[depEntry.groupIndex].indexOf(depEntry), 1);
+
+          // if the old group is empty, then we have a mixed depndency cycle
+          if (groups[depEntry.groupIndex].length == 0)
+            throw new TypeError("Mixed dependency cycle detected");
+        }
+
         depEntry.groupIndex = depGroupIndex;
       }
-      else if (depEntry.groupIndex != depGroupIndex) {
-        throw new TypeError('System.register mixed dependency cycle');
-      }
 
       buildGroups(depEntry, loader, groups);
     }
@@ -336,7 +344,7 @@ function register(loader) {
 
     buildGroups(startEntry, loader, groups);
 
-    var curGroupDeclarative = startEntry.declarative == groups.length % 2;
+    var curGroupDeclarative = !!startEntry.declarative == groups.length % 2;
     for (var i = groups.length - 1; i >= 0; i--) {
       var group = groups[i];
       for (var j = 0; j < group.length; j++) {
@@ -482,8 +490,12 @@ function register(loader) {
 
     for (var i = 0; i < entry.normalizedDeps.length; i++) {
       var depName = entry.normalizedDeps[i];
-      if (indexOf.call(seen, depName) == -1)
-        ensureEvaluated(depName, seen, loader);
+      if (indexOf.call(seen, depName) == -1) {
+        if (!loader.defined[depName])
+          loader.get(depName);
+        else
+          ensureEvaluated(depName, seen, loader);
+      }
     }
 
     if (entry.evaluated)
diff --git a/dist/system-production-amd.min.js b/dist/system-production-amd.min.js
index 372fec38..29639fbe 100644
--- a/dist/system-production-amd.min.js
+++ b/dist/system-production-amd.min.js
@@ -5,4 +5,4 @@
  * MIT License
  */
 
-!function(__$global){function __eval(__source,__global,__address,__sourceMap){try{__source="with(__global) { (function() { "+__source+" \n }).call(__global); }\n//# sourceURL="+__address+(__sourceMap?"\n//# sourceMappingURL="+__sourceMap:""),eval(__source)}catch(e){throw"SyntaxError"==e.name&&(e.message="Evaluating "+__address+"\n	"+e.message),e}}var indexOf=Array.prototype.indexOf||function(e){for(var t=0,r=this.length;r>t;t++)if(this[t]===e)return t;return-1};__$global.upgradeSystemLoader=function(){function e(e){function t(e){var t=this;"@traceur"==e.name&&(m=System,p=Module);var r,n=e.source.lastIndexOf("\n");-1!=n&&"//# sourceMappingURL="==e.source.substr(n+1,21)&&(r=a(e.address,e.source.substr(n+22))),__eval(e.source,t.global,e.address,r),"@traceur"==e.name&&(t.global.traceurSystem=t.global.System,t.global.System=m)}function r(e){var t=String(e).replace(/^\s+|\s+$/g,"").match(/^([^:\/?#]+:)?(\/\/(?:[^:@]*(?::[^:@]*)?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);return t?{href:t[0]||"",protocol:t[1]||"",authority:t[2]||"",host:t[3]||"",hostname:t[4]||"",port:t[5]||"",pathname:t[6]||"",search:t[7]||"",hash:t[8]||""}:null}function a(e,t){function a(e){var t=[];return e.replace(/^(\.\.?(\/|$))+/,"").replace(/\/(\.(\/|$))+/g,"/").replace(/\/\.\.$/,"/../").replace(/\/?[^\/]*/g,function(e){"/.."===e?t.pop():t.push(e)}),t.join("").replace(/^\//,"/"===e.charAt(0)?"/":"")}return t=r(t||""),e=r(e||""),t&&e?(t.protocol||e.protocol)+(t.protocol||t.authority?t.authority:e.authority)+a(t.protocol||t.authority||"/"===t.pathname.charAt(0)?t.pathname:t.pathname?(e.authority&&!e.pathname?"/":"")+e.pathname.slice(0,e.pathname.lastIndexOf("/")+1)+t.pathname:e.pathname)+(t.protocol||t.authority||t.pathname?t.search:t.search||e.search)+t.hash:null}var n=e["import"];e["import"]=function(e,t){return n.call(this,e,t).then(function(e){return e.__useDefault?e["default"]:e})},e.set("@empty",Module({})),e.config=function(e){for(var t in e){var r=e[t];if("object"==typeof r){this[t]=this[t]||{};for(var a in r)this[t][a]=r[a]}else this[t]=r}};var i;if("undefined"==typeof window)i=__dirname+"/";else if(i=document.baseURI,!i){var o=document.getElementsByTagName("base");i=o[0]&&o[0].href||window.location.href}var s,u=e.locate;e.locate=function(e){return this.baseURL!=s&&(s=a(i,this.baseURL),"/"!=s.substr(s.length-1,1)&&(s+="/"),this.baseURL=s),Promise.resolve(u.call(this,e))};var d=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,l=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,c=e.translate;e.translate=function(e){var r=this;if(r.__exec=t,"@traceur"==e.name)return c.call(r,e);var a;if(!r.global.traceur&&("es6"==e.metadata.format||!e.metadata.format)&&(a=e.source.match(d))){var n=a[1]||a[2];e.metadata.deps=[n],e.metadata.execute=function(e){return e(n)}}return"es6"!=e.metadata.format&&(e.metadata.format||!e.source.match(l))||(e.metadata.format="es6",r.global.traceur)?c.call(r,e):r["import"]("@traceur").then(function(){return c.call(r,e)})};var f=e.instantiate;e.instantiate=function(e){var t=this;return"@traceur"==e.name?(t.__exec(e),{deps:[],execute:function(){return Module({})}}):f.call(t,e)};var m,p;e.__exec=t}function t(e){function t(e){for(var t=[],r=0;r<e.length;r++)-1==indexOf.call(t,e[r])&&t.push(e[r]);return t}function r(t,r,a){if("string"!=typeof t&&(a=r,r=t,t=null),0==a.length)throw"Invalid System.register form. Ensure setting --modules=instantiate if using Traceur.";e.defined||(e.defined={}),d={deps:r,declare:a,declarative:!0},t&&(e.defined[t]=d)}function a(e,t,r){if(r[e.groupIndex]=r[e.groupIndex]||[],-1==indexOf.call(r[e.groupIndex],e)){r[e.groupIndex].push(e);for(var n=0;n<e.normalizedDeps.length;n++){var i=e.normalizedDeps[n],o=t.defined[i];if(o){var s=e.groupIndex+(o.declarative!=e.declarative);if(void 0===o.groupIndex)o.groupIndex=s;else if(o.groupIndex!=s)throw new TypeError("System.register mixed dependency cycle");a(o,t,r)}}}}function n(e,t){var r=t.defined[e];r.groupIndex=0;var n=[];a(r,t,n);for(var o=r.declarative==n.length%2,u=n.length-1;u>=0;u--){for(var d=n[u],l=0;l<d.length;l++){var c=d[l];o?i(c,t):s(c,t)}o=!o}}function i(e,t){if(!e.module){var r=[],a=e.declare.call(t.global,r);e.module=a.exports,e.exportStar=a.exportStar,e.execute=a.execute;for(var n=e.module,o=0;o<e.normalizedDeps.length;o++){var s=e.normalizedDeps[o],u=t.defined[s];u?u.module?depModule=u.module:(i(u,t),depModule=u.module):depModule=t.get(s),e.exportStar&&-1!=indexOf.call(e.exportStar,e.normalizedDeps[o])&&!function(e){for(var t in e)(function(t){Object.defineProperty(n,t,{enumerable:!0,get:function(){return e[t]},set:function(r){e[t]=r}})})(t)}(depModule),r[o]=depModule}}}function o(e,t){var r,a=t.defined[e];return a?(a.declarative?u(e,[],t):a.evaluated||s(a,t),r=a.module):r=t.get(e),r.__useDefault?r["default"]:r}function s(e,t){if(!e.module){if(e.module={},!e.executingRequire)for(var r=0;r<e.normalizedDeps.length;r++){var a=e.normalizedDeps[r],n=t.defined[a];n&&s(n,t)}try{e.evaluated=!0;var i=e.execute(function(r){for(var a=0;a<e.deps.length;a++)if(e.deps[a]==r)return o(e.normalizedDeps[a],t)},e.module,name)}catch(u){throw u}i&&(e.module=i)}}function u(e,t,r){var a=r.defined[e];if(!a.evaluated&&a.declarative){t.push(e);for(var n=0;n<a.normalizedDeps.length;n++){var i=a.normalizedDeps[n];-1==indexOf.call(t,i)&&u(i,t,r)}a.evaluated||(a.evaluated=!0,a.execute.call(r.global),delete a.execute)}}if("undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),!e.__exec)throw"loader.__exec(load) needs to be provided for loader.register. See SystemJS core for an implementation example.";var d;e.defined=e.defined||{},e.register=r;var l=/System\.register/,c=e.fetch;e.fetch=function(e){var t=this;return t.defined&&t.defined[e.name]?"":c(e)};var f=e.translate;e.translate=function(t){return e.register=r,t.metadata.deps=t.metadata.deps||[],("register"==t.metadata.format||!t.metadata.format&&t.source.match(l))&&(t.metadata.format="register"),f.call(this,t)};var m=e.instantiate;e.instantiate=function(e){var r,a=this;if(a.defined[e.name]?a.defined[e.name]=r=a.defined[e.name]:e.metadata.execute?a.defined[e.name]=r={deps:e.metadata.deps||[],execute:e.metadata.execute,executingRequire:e.metadata.executingRequire}:"register"==e.metadata.format&&(d=null,a.__exec(e),d&&(a.defined[e.name]=r=d)),!r)return m.call(this,e);r.deps=t(r.deps);for(var i=[],o=0;o<r.deps.length;o++)i.push(Promise.resolve(a.normalize(r.deps[o],e.name)));return Promise.all(i).then(function(t){return r.normalizedDeps=t,r.depMap=[],r.asdfasdf="asdf"+Math.random(),{deps:r.deps,execute:function(){if(r.esmodule)return delete a.defined[e.name],r.esmodule;n(e.name,a),u(e.name,[],a),delete a.defined[e.name];var t=Module(r.module);for(var i in a.defined)a.defined[i].execute==r.execute&&(a.defined[i].esmodule=t);return t}}})}}function r(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=document.getElementsByTagName("head")[0];e.fetch=function(e){return new Promise(function(r,a){var n=document.createElement("script");n.async=!0,n.addEventListener("load",function(){r("")},!1),n.addEventListener("error",function(e){a(e)},!1),n.src=e.address,t.appendChild(n)})}}function a(e){function t(e,t){var r=t.split("/"),a=e.split("/");if(r.length>a.length)return 0;for(var n=0;n<r.length;n++)if(a[n]!=r[n])return 0;return r.length}function r(e,r,a){var n,i,o,s,u=0,d=0;if(r)for(var l in a.map){var c=a.map[l];if("object"==typeof c&&!(t(r,l)<=d))for(var f in c)t(e,f)<=u||(n=f,u=f.split("/").length,i=l,d=l.split("/").length)}n&&(s=e.split("/"),o=s.splice(u,s.length-u).join("/"),e=a.map[i][n]+(o?"/"+o:""),u=0);for(var l in a.map){var c=a.map[l];"string"==typeof c&&(t(e,l)<=u||(n=l,u=l.split("/").length))}return u?(s=e.split("/"),o=s.splice(u,s.length-u).join("/"),a.map[n]+(o?"/"+o:"")):e}e.map=e.map||{};var a=e.normalize;e.normalize=function(e,t,n){var i=this;return i.map||(i.map={}),Promise.resolve(a.call(i,e,t,n)).then(function(e){return r(e,t,i)})}}function n(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),e.bundles=e.bundles||{};var t=e.fetch;e.fetch=function(r){e.bundles||(e.bundles={});for(var a in e.bundles)if(-1!=indexOf.call(e.bundles[a],r.name))return Promise.resolve(e.normalize(a)).then(function(t){return e.bundles[t]=e.bundles[t]||e.bundles[a],e.load(t)}).then(function(){return""});return t.apply(this,arguments)}}function i(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,r=function(e,t){var r,a=e.split("."),n=t.split(".");a[2]&&-1!=(r=indexOf.call(a[2],"-"))&&a.splice(2,1,a[2].substr(0,r),a[2].substr(r+1)),n[2]&&-1!=(r=indexOf.call(n[2],"-"))&&n.splice(2,1,n[2].substr(0,r),n[2].substr(r+1));for(var i=0;i<Math.max(a.length,n.length);i++){if(!a[i])return 1;if(!n[i])return-1;if(a[i]!=n[i])return parseInt(a[i])>parseInt(n[i])?1:-1}return 0};e.versions=e.versions||{};var a=e.normalize;e.normalize=function(n,i,o){e.versions||(e.versions={});var s=this.versions;return Promise.resolve(a.call(this,n,i,o)).then(function(e){var a,n,i,o,u=e.indexOf("@");if(-1==u){for(var d in s)if(o=s[d],e.substr(0,d.length)==d&&(i=e.substr(d.length,1),!i||"/"==i))return d+"@"+("string"==typeof o?o:o[o.length-1])+e.substr(d.length);return e}a=e.substr(u+1).split("/")[0];var l,c=a.length;if("^"==a.substr(0,1)&&(a=a.substr(1),l=!0),n=a.match(t),!n)return e;l&&(n[2]||(l=!1),n[3]||(n[2]>0?n[3]="0":l=!1)),l&&(n[1]>0?(n[2]||(a=n[1]+".0.0"),n[3]||(a=n[1]+".0"),l=a,n=[n[1]]):n[2]>0?(l=a,n=[0,n[2]]):(l=!1,n=[0,0,n[3]]),a=n.join("."));var f=e.substr(0,u);if(o=s[f]||[],"string"==typeof o&&(o=[o]),!n[3]||l)for(var m=o.length-1;m>=0;m--){var p=o[m];if(p.substr(0,a.length)==a&&p.substr(a.length,1).match(/^[\.\-]?$/)&&(!l||l&&-1!=r(p,l)))return f+"@"+p+e.substr(f.length+c+1)}return-1==indexOf.call(o,a)&&(o.push(a),o.sort(r),e=f+"@"+a+e.substr(f.length+c+1),n[3]&&-1!=(u=indexOf.call(o,n[1]+"."+n[2]))&&o.splice(u,1),n[2]&&-1!=(u=indexOf.call(o,n[1]))&&o.splice(u,1),s[f]=1==o.length?o[0]:o),e})}}__$global.upgradeSystemLoader=void 0,e(System),t(System),r(System),a(System),n(System),i(System),System.baseURL=__$curScript.getAttribute("data-baseurl")||System.baseURL;var o=__$curScript.getAttribute("data-config");""===o&&(o=System.baseURL+"config.json");var s=__$curScript.getAttribute("data-main");System.paths["@traceur"]||(System.paths["@traceur"]="undefined"!=typeof __$curScript&&__$curScript.getAttribute("data-traceur-src")),(o?Promise.resolve(System.fetch.call(System,{address:o,metadata:{}})).then(JSON.parse).then(System.config):Promise.resolve()).then(function(){return s?System["import"](s):void 0})["catch"](function(e){setTimeout(function(){throw e})})};var __$curScript;!function(e){if("undefined"!=typeof window){var t=document.getElementsByTagName("script");if(__$curScript=t[t.length-1],!e.System||e.System.registerModule){var r=__$curScript.src,a=r.substr(0,r.lastIndexOf("/")+1);document.write('<script type="text/javascript" src="'+a+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}else e.upgradeSystemLoader()}else{var n=require("es6-module-loader");e.System=n.System,e.Loader=n.Loader,e.Module=n.Module,module.exports=e.System,e.upgradeSystemLoader()}}(__$global)}("undefined"!=typeof window?window:global);
\ No newline at end of file
+!function(__$global){function __eval(__source,__global,__address,__sourceMap){try{__source="with(__global) { (function() { "+__source+" \n }).call(__global); }\n//# sourceURL="+__address+(__sourceMap?"\n//# sourceMappingURL="+__sourceMap:""),eval(__source)}catch(e){throw"SyntaxError"==e.name&&(e.message="Evaluating "+__address+"\n	"+e.message),e}}var indexOf=Array.prototype.indexOf||function(e){for(var t=0,r=this.length;r>t;t++)if(this[t]===e)return t;return-1};__$global.upgradeSystemLoader=function(){function e(e){function t(e){var t=this;"@traceur"==e.name&&(m=System,p=Module);var r,a=e.source.lastIndexOf("\n");-1!=a&&"//# sourceMappingURL="==e.source.substr(a+1,21)&&(r=n(e.address,e.source.substr(a+22))),__eval(e.source,t.global,e.address,r),"@traceur"==e.name&&(t.global.traceurSystem=t.global.System,t.global.System=m)}function r(e){var t=String(e).replace(/^\s+|\s+$/g,"").match(/^([^:\/?#]+:)?(\/\/(?:[^:@]*(?::[^:@]*)?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);return t?{href:t[0]||"",protocol:t[1]||"",authority:t[2]||"",host:t[3]||"",hostname:t[4]||"",port:t[5]||"",pathname:t[6]||"",search:t[7]||"",hash:t[8]||""}:null}function n(e,t){function n(e){var t=[];return e.replace(/^(\.\.?(\/|$))+/,"").replace(/\/(\.(\/|$))+/g,"/").replace(/\/\.\.$/,"/../").replace(/\/?[^\/]*/g,function(e){"/.."===e?t.pop():t.push(e)}),t.join("").replace(/^\//,"/"===e.charAt(0)?"/":"")}return t=r(t||""),e=r(e||""),t&&e?(t.protocol||e.protocol)+(t.protocol||t.authority?t.authority:e.authority)+n(t.protocol||t.authority||"/"===t.pathname.charAt(0)?t.pathname:t.pathname?(e.authority&&!e.pathname?"/":"")+e.pathname.slice(0,e.pathname.lastIndexOf("/")+1)+t.pathname:e.pathname)+(t.protocol||t.authority||t.pathname?t.search:t.search||e.search)+t.hash:null}var a=e["import"];e["import"]=function(e,t){return a.call(this,e,t).then(function(e){return e.__useDefault?e["default"]:e})},e.set("@empty",Module({})),e.config=function(e){for(var t in e){var r=e[t];if("object"==typeof r){this[t]=this[t]||{};for(var n in r)this[t][n]=r[n]}else this[t]=r}};var o;if("undefined"==typeof window)o=__dirname+"/";else if(o=document.baseURI,!o){var i=document.getElementsByTagName("base");o=i[0]&&i[0].href||window.location.href}var s,u=e.locate;e.locate=function(e){return this.baseURL!=s&&(s=n(o,this.baseURL),"/"!=s.substr(s.length-1,1)&&(s+="/"),this.baseURL=s),Promise.resolve(u.call(this,e))};var d=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,l=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,c=e.translate;e.translate=function(e){var r=this;if(r.__exec=t,"@traceur"==e.name)return c.call(r,e);var n;if(!r.global.traceur&&("es6"==e.metadata.format||!e.metadata.format)&&(n=e.source.match(d))){var a=n[1]||n[2];e.metadata.deps=[a],e.metadata.execute=function(e){return e(a)}}return"es6"!=e.metadata.format&&(e.metadata.format||!e.source.match(l))||(e.metadata.format="es6",r.global.traceur)?c.call(r,e):r["import"]("@traceur").then(function(){return c.call(r,e)})};var f=e.instantiate;e.instantiate=function(e){var t=this;return"@traceur"==e.name?(t.__exec(e),{deps:[],execute:function(){return Module({})}}):f.call(t,e)};var m,p;e.__exec=t}function t(e){function t(e){for(var t=[],r=0;r<e.length;r++)-1==indexOf.call(t,e[r])&&t.push(e[r]);return t}function r(t,r,n){if("string"!=typeof t&&(n=r,r=t,t=null),0==n.length)throw"Invalid System.register form. Ensure setting --modules=instantiate if using Traceur.";e.defined||(e.defined={}),d={deps:r,declare:n,declarative:!0},t&&(e.defined[t]=d)}function n(e,t,r){if(r[e.groupIndex]=r[e.groupIndex]||[],-1==indexOf.call(r[e.groupIndex],e)){r[e.groupIndex].push(e);for(var a=0;a<e.normalizedDeps.length;a++){var o=e.normalizedDeps[a],i=t.defined[o];if(i){var s=e.groupIndex+(i.declarative!=e.declarative);if(void 0===i.groupIndex||i.groupIndex<s){if(i.groupIndex&&(r[i.groupIndex].splice(r[i.groupIndex].indexOf(i),1),0==r[i.groupIndex].length))throw new TypeError("Mixed dependency cycle detected");i.groupIndex=s}n(i,t,r)}}}}function a(e,t){var r=t.defined[e];r.groupIndex=0;var a=[];n(r,t,a);for(var i=!!r.declarative==a.length%2,u=a.length-1;u>=0;u--){for(var d=a[u],l=0;l<d.length;l++){var c=d[l];i?o(c,t):s(c,t)}i=!i}}function o(e,t){if(!e.module){var r=[],n=e.declare.call(t.global,r);e.module=n.exports,e.exportStar=n.exportStar,e.execute=n.execute;for(var a=e.module,i=0;i<e.normalizedDeps.length;i++){var s=e.normalizedDeps[i],u=t.defined[s];u?u.module?depModule=u.module:(o(u,t),depModule=u.module):depModule=t.get(s),e.exportStar&&-1!=indexOf.call(e.exportStar,e.normalizedDeps[i])&&!function(e){for(var t in e)(function(t){Object.defineProperty(a,t,{enumerable:!0,get:function(){return e[t]},set:function(r){e[t]=r}})})(t)}(depModule),r[i]=depModule}}}function i(e,t){var r,n=t.defined[e];return n?(n.declarative?u(e,[],t):n.evaluated||s(n,t),r=n.module):r=t.get(e),r.__useDefault?r["default"]:r}function s(e,t){if(!e.module){if(e.module={},!e.executingRequire)for(var r=0;r<e.normalizedDeps.length;r++){var n=e.normalizedDeps[r],a=t.defined[n];a&&s(a,t)}try{e.evaluated=!0;var o=e.execute(function(r){for(var n=0;n<e.deps.length;n++)if(e.deps[n]==r)return i(e.normalizedDeps[n],t)},e.module,name)}catch(u){throw u}o&&(e.module=o)}}function u(e,t,r){var n=r.defined[e];if(!n.evaluated&&n.declarative){t.push(e);for(var a=0;a<n.normalizedDeps.length;a++){var o=n.normalizedDeps[a];-1==indexOf.call(t,o)&&(r.defined[o]?u(o,t,r):r.get(o))}n.evaluated||(n.evaluated=!0,n.execute.call(r.global),delete n.execute)}}if("undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),!e.__exec)throw"loader.__exec(load) needs to be provided for loader.register. See SystemJS core for an implementation example.";var d;e.defined=e.defined||{},e.register=r;var l=/System\.register/,c=e.fetch;e.fetch=function(e){var t=this;return t.defined&&t.defined[e.name]?"":c(e)};var f=e.translate;e.translate=function(t){return e.register=r,t.metadata.deps=t.metadata.deps||[],("register"==t.metadata.format||!t.metadata.format&&t.source.match(l))&&(t.metadata.format="register"),f.call(this,t)};var m=e.instantiate;e.instantiate=function(e){var r,n=this;if(n.defined[e.name]?n.defined[e.name]=r=n.defined[e.name]:e.metadata.execute?n.defined[e.name]=r={deps:e.metadata.deps||[],execute:e.metadata.execute,executingRequire:e.metadata.executingRequire}:"register"==e.metadata.format&&(d=null,n.__exec(e),d&&(n.defined[e.name]=r=d)),!r)return m.call(this,e);r.deps=t(r.deps);for(var o=[],i=0;i<r.deps.length;i++)o.push(Promise.resolve(n.normalize(r.deps[i],e.name)));return Promise.all(o).then(function(t){return r.normalizedDeps=t,r.depMap=[],r.asdfasdf="asdf"+Math.random(),{deps:r.deps,execute:function(){if(r.esmodule)return delete n.defined[e.name],r.esmodule;a(e.name,n),u(e.name,[],n),delete n.defined[e.name];var t=Module(r.module);for(var o in n.defined)n.defined[o].execute==r.execute&&(n.defined[o].esmodule=t);return t}}})}}function r(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=document.getElementsByTagName("head")[0];e.fetch=function(e){return new Promise(function(r,n){var a=document.createElement("script");a.async=!0,a.addEventListener("load",function(){r("")},!1),a.addEventListener("error",function(e){n(e)},!1),a.src=e.address,t.appendChild(a)})}}function n(e){function t(e,t){var r=t.split("/"),n=e.split("/");if(r.length>n.length)return 0;for(var a=0;a<r.length;a++)if(n[a]!=r[a])return 0;return r.length}function r(e,r,n){var a,o,i,s,u=0,d=0;if(r)for(var l in n.map){var c=n.map[l];if("object"==typeof c&&!(t(r,l)<=d))for(var f in c)t(e,f)<=u||(a=f,u=f.split("/").length,o=l,d=l.split("/").length)}a&&(s=e.split("/"),i=s.splice(u,s.length-u).join("/"),e=n.map[o][a]+(i?"/"+i:""),u=0);for(var l in n.map){var c=n.map[l];"string"==typeof c&&(t(e,l)<=u||(a=l,u=l.split("/").length))}return u?(s=e.split("/"),i=s.splice(u,s.length-u).join("/"),n.map[a]+(i?"/"+i:"")):e}e.map=e.map||{};var n=e.normalize;e.normalize=function(e,t,a){var o=this;return o.map||(o.map={}),Promise.resolve(n.call(o,e,t,a)).then(function(e){return r(e,t,o)})}}function a(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),e.bundles=e.bundles||{};var t=e.fetch;e.fetch=function(r){e.bundles||(e.bundles={});for(var n in e.bundles)if(-1!=indexOf.call(e.bundles[n],r.name))return Promise.resolve(e.normalize(n)).then(function(t){return e.bundles[t]=e.bundles[t]||e.bundles[n],e.load(t)}).then(function(){return""});return t.apply(this,arguments)}}function o(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,r=function(e,t){var r,n=e.split("."),a=t.split(".");n[2]&&-1!=(r=indexOf.call(n[2],"-"))&&n.splice(2,1,n[2].substr(0,r),n[2].substr(r+1)),a[2]&&-1!=(r=indexOf.call(a[2],"-"))&&a.splice(2,1,a[2].substr(0,r),a[2].substr(r+1));for(var o=0;o<Math.max(n.length,a.length);o++){if(!n[o])return 1;if(!a[o])return-1;if(n[o]!=a[o])return parseInt(n[o])>parseInt(a[o])?1:-1}return 0};e.versions=e.versions||{};var n=e.normalize;e.normalize=function(a,o,i){e.versions||(e.versions={});var s=this.versions;return Promise.resolve(n.call(this,a,o,i)).then(function(e){var n,a,o,i,u=e.indexOf("@");if(-1==u){for(var d in s)if(i=s[d],e.substr(0,d.length)==d&&(o=e.substr(d.length,1),!o||"/"==o))return d+"@"+("string"==typeof i?i:i[i.length-1])+e.substr(d.length);return e}n=e.substr(u+1).split("/")[0];var l,c=n.length;if("^"==n.substr(0,1)&&(n=n.substr(1),l=!0),a=n.match(t),!a)return e;l&&(a[2]||(l=!1),a[3]||(a[2]>0?a[3]="0":l=!1)),l&&(a[1]>0?(a[2]||(n=a[1]+".0.0"),a[3]||(n=a[1]+".0"),l=n,a=[a[1]]):a[2]>0?(l=n,a=[0,a[2]]):(l=!1,a=[0,0,a[3]]),n=a.join("."));var f=e.substr(0,u);if(i=s[f]||[],"string"==typeof i&&(i=[i]),!a[3]||l)for(var m=i.length-1;m>=0;m--){var p=i[m];if(p.substr(0,n.length)==n&&p.substr(n.length,1).match(/^[\.\-]?$/)&&(!l||l&&-1!=r(p,l)))return f+"@"+p+e.substr(f.length+c+1)}return-1==indexOf.call(i,n)&&(i.push(n),i.sort(r),e=f+"@"+n+e.substr(f.length+c+1),a[3]&&-1!=(u=indexOf.call(i,a[1]+"."+a[2]))&&i.splice(u,1),a[2]&&-1!=(u=indexOf.call(i,a[1]))&&i.splice(u,1),s[f]=1==i.length?i[0]:i),e})}}__$global.upgradeSystemLoader=void 0,e(System),t(System),r(System),n(System),a(System),o(System),System.baseURL=__$curScript.getAttribute("data-baseurl")||System.baseURL;var i=__$curScript.getAttribute("data-config");""===i&&(i=System.baseURL+"config.json");var s=__$curScript.getAttribute("data-main");System.paths["@traceur"]||(System.paths["@traceur"]="undefined"!=typeof __$curScript&&__$curScript.getAttribute("data-traceur-src")),(i?Promise.resolve(System.fetch.call(System,{address:i,metadata:{}})).then(JSON.parse).then(System.config):Promise.resolve()).then(function(){return s?System["import"](s):void 0})["catch"](function(e){setTimeout(function(){throw e})})};var __$curScript;!function(e){if("undefined"!=typeof window){var t=document.getElementsByTagName("script");if(__$curScript=t[t.length-1],!e.System||e.System.registerModule){var r=__$curScript.src,n=r.substr(0,r.lastIndexOf("/")+1);document.write('<script type="text/javascript" src="'+n+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}else e.upgradeSystemLoader()}else{var a=require("es6-module-loader");e.System=a.System,e.Loader=a.Loader,e.Module=a.Module,module.exports=e.System,e.upgradeSystemLoader()}}(__$global)}("undefined"!=typeof window?window:global);
\ No newline at end of file
diff --git a/dist/system.js b/dist/system.js
index 6796a4d0..ccb6183c 100644
--- a/dist/system.js
+++ b/dist/system.js
@@ -409,12 +409,20 @@ function register(loader) {
       // now we know the entry is in our unlinked linkage group
       var depGroupIndex = entry.groupIndex + (depEntry.declarative != entry.declarative);
 
-      if (depEntry.groupIndex === undefined) {
+      // the group index of an entry is always the maximum
+      if (depEntry.groupIndex === undefined || depEntry.groupIndex < depGroupIndex) {
+        
+        // if already in a group, remove from the old group
+        if (depEntry.groupIndex) {
+          groups[depEntry.groupIndex].splice(groups[depEntry.groupIndex].indexOf(depEntry), 1);
+
+          // if the old group is empty, then we have a mixed depndency cycle
+          if (groups[depEntry.groupIndex].length == 0)
+            throw new TypeError("Mixed dependency cycle detected");
+        }
+
         depEntry.groupIndex = depGroupIndex;
       }
-      else if (depEntry.groupIndex != depGroupIndex) {
-        throw new TypeError('System.register mixed dependency cycle');
-      }
 
       buildGroups(depEntry, loader, groups);
     }
@@ -429,7 +437,7 @@ function register(loader) {
 
     buildGroups(startEntry, loader, groups);
 
-    var curGroupDeclarative = startEntry.declarative == groups.length % 2;
+    var curGroupDeclarative = !!startEntry.declarative == groups.length % 2;
     for (var i = groups.length - 1; i >= 0; i--) {
       var group = groups[i];
       for (var j = 0; j < group.length; j++) {
@@ -575,8 +583,12 @@ function register(loader) {
 
     for (var i = 0; i < entry.normalizedDeps.length; i++) {
       var depName = entry.normalizedDeps[i];
-      if (indexOf.call(seen, depName) == -1)
-        ensureEvaluated(depName, seen, loader);
+      if (indexOf.call(seen, depName) == -1) {
+        if (!loader.defined[depName])
+          loader.get(depName);
+        else
+          ensureEvaluated(depName, seen, loader);
+      }
     }
 
     if (entry.evaluated)
diff --git a/dist/system.min.js b/dist/system.min.js
index 59c1e5b4..c04b43ac 100644
--- a/dist/system.min.js
+++ b/dist/system.min.js
@@ -5,4 +5,4 @@
  * MIT License
  */
 
-!function(__$global){function __eval(__source,__global,__address,__sourceMap){try{__source="with(__global) { (function() { "+__source+" \n }).call(__global); }\n//# sourceURL="+__address+(__sourceMap?"\n//# sourceMappingURL="+__sourceMap:""),eval(__source)}catch(e){throw"SyntaxError"==e.name&&(e.message="Evaluating "+__address+"\n	"+e.message),e}}var indexOf=Array.prototype.indexOf||function(e){for(var t=0,a=this.length;a>t;t++)if(this[t]===e)return t;return-1};__$global.upgradeSystemLoader=function(){function e(e){function t(e){var t=this;"@traceur"==e.name&&(m=System,p=Module);var a,n=e.source.lastIndexOf("\n");-1!=n&&"//# sourceMappingURL="==e.source.substr(n+1,21)&&(a=r(e.address,e.source.substr(n+22))),__eval(e.source,t.global,e.address,a),"@traceur"==e.name&&(t.global.traceurSystem=t.global.System,t.global.System=m)}function a(e){var t=String(e).replace(/^\s+|\s+$/g,"").match(/^([^:\/?#]+:)?(\/\/(?:[^:@]*(?::[^:@]*)?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);return t?{href:t[0]||"",protocol:t[1]||"",authority:t[2]||"",host:t[3]||"",hostname:t[4]||"",port:t[5]||"",pathname:t[6]||"",search:t[7]||"",hash:t[8]||""}:null}function r(e,t){function r(e){var t=[];return e.replace(/^(\.\.?(\/|$))+/,"").replace(/\/(\.(\/|$))+/g,"/").replace(/\/\.\.$/,"/../").replace(/\/?[^\/]*/g,function(e){"/.."===e?t.pop():t.push(e)}),t.join("").replace(/^\//,"/"===e.charAt(0)?"/":"")}return t=a(t||""),e=a(e||""),t&&e?(t.protocol||e.protocol)+(t.protocol||t.authority?t.authority:e.authority)+r(t.protocol||t.authority||"/"===t.pathname.charAt(0)?t.pathname:t.pathname?(e.authority&&!e.pathname?"/":"")+e.pathname.slice(0,e.pathname.lastIndexOf("/")+1)+t.pathname:e.pathname)+(t.protocol||t.authority||t.pathname?t.search:t.search||e.search)+t.hash:null}var n=e["import"];e["import"]=function(e,t){return n.call(this,e,t).then(function(e){return e.__useDefault?e["default"]:e})},e.set("@empty",Module({})),e.config=function(e){for(var t in e){var a=e[t];if("object"==typeof a){this[t]=this[t]||{};for(var r in a)this[t][r]=a[r]}else this[t]=a}};var o;if("undefined"==typeof window)o=__dirname+"/";else if(o=document.baseURI,!o){var i=document.getElementsByTagName("base");o=i[0]&&i[0].href||window.location.href}var s,l=e.locate;e.locate=function(e){return this.baseURL!=s&&(s=r(o,this.baseURL),"/"!=s.substr(s.length-1,1)&&(s+="/"),this.baseURL=s),Promise.resolve(l.call(this,e))};var u=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,d=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,c=e.translate;e.translate=function(e){var a=this;if(a.__exec=t,"@traceur"==e.name)return c.call(a,e);var r;if(!a.global.traceur&&("es6"==e.metadata.format||!e.metadata.format)&&(r=e.source.match(u))){var n=r[1]||r[2];e.metadata.deps=[n],e.metadata.execute=function(e){return e(n)}}return"es6"!=e.metadata.format&&(e.metadata.format||!e.source.match(d))||(e.metadata.format="es6",a.global.traceur)?c.call(a,e):a["import"]("@traceur").then(function(){return c.call(a,e)})};var f=e.instantiate;e.instantiate=function(e){var t=this;return"@traceur"==e.name?(t.__exec(e),{deps:[],execute:function(){return Module({})}}):f.call(t,e)};var m,p;e.__exec=t}function t(e){function t(e,t){var a=e.meta&&e.meta[t.name];if(a)for(var r in a)t.metadata[r]=t.metadata[r]||a[r]}var a=/^(\s*\/\*.*\*\/|\s*\/\/[^\n]*|\s*"[^"]+"\s*;?|\s*'[^']+'\s*;?)+/,r=/\/\*.*\*\/|\/\/[^\n]*|"[^"]+"\s*;?|'[^']+'\s*;?/g;e.meta={};var n=e.locate;e.locate=function(e){return t(this,e),n.call(this,e)};var o=e.translate;e.translate=function(e){var n=e.source.match(a);if(n)for(var i=n[0].match(r),s=0;s<i.length;s++){var l=i[s].length,u=i[s].substr(0,1);if(";"==i[s].substr(l-1,1)&&l--,'"'==u||"'"==u){var d=i[s].substr(1,i[s].length-3),c=d.substr(0,d.indexOf(" "));if(c){var f=d.substr(c.length+1,d.length-c.length-1);e.metadata[c]instanceof Array?e.metadata[c].push(f):e.metadata[c]=f}}}return t(this,e),o.call(this,e)}}function a(e){function t(e){for(var t=[],a=0;a<e.length;a++)-1==indexOf.call(t,e[a])&&t.push(e[a]);return t}function a(t,a,r){if("string"!=typeof t&&(r=a,a=t,t=null),0==r.length)throw"Invalid System.register form. Ensure setting --modules=instantiate if using Traceur.";e.defined||(e.defined={}),u={deps:a,declare:r,declarative:!0},t&&(e.defined[t]=u)}function r(e,t,a){if(a[e.groupIndex]=a[e.groupIndex]||[],-1==indexOf.call(a[e.groupIndex],e)){a[e.groupIndex].push(e);for(var n=0;n<e.normalizedDeps.length;n++){var o=e.normalizedDeps[n],i=t.defined[o];if(i){var s=e.groupIndex+(i.declarative!=e.declarative);if(void 0===i.groupIndex)i.groupIndex=s;else if(i.groupIndex!=s)throw new TypeError("System.register mixed dependency cycle");r(i,t,a)}}}}function n(e,t){var a=t.defined[e];a.groupIndex=0;var n=[];r(a,t,n);for(var i=a.declarative==n.length%2,l=n.length-1;l>=0;l--){for(var u=n[l],d=0;d<u.length;d++){var c=u[d];i?o(c,t):s(c,t)}i=!i}}function o(e,t){if(!e.module){var a=[],r=e.declare.call(t.global,a);e.module=r.exports,e.exportStar=r.exportStar,e.execute=r.execute;for(var n=e.module,i=0;i<e.normalizedDeps.length;i++){var s=e.normalizedDeps[i],l=t.defined[s];l?l.module?depModule=l.module:(o(l,t),depModule=l.module):depModule=t.get(s),e.exportStar&&-1!=indexOf.call(e.exportStar,e.normalizedDeps[i])&&!function(e){for(var t in e)(function(t){Object.defineProperty(n,t,{enumerable:!0,get:function(){return e[t]},set:function(a){e[t]=a}})})(t)}(depModule),a[i]=depModule}}}function i(e,t){var a,r=t.defined[e];return r?(r.declarative?l(e,[],t):r.evaluated||s(r,t),a=r.module):a=t.get(e),a.__useDefault?a["default"]:a}function s(e,t){if(!e.module){if(e.module={},!e.executingRequire)for(var a=0;a<e.normalizedDeps.length;a++){var r=e.normalizedDeps[a],n=t.defined[r];n&&s(n,t)}try{e.evaluated=!0;var o=e.execute(function(a){for(var r=0;r<e.deps.length;r++)if(e.deps[r]==a)return i(e.normalizedDeps[r],t)},e.module,name)}catch(l){throw l}o&&(e.module=o)}}function l(e,t,a){var r=a.defined[e];if(!r.evaluated&&r.declarative){t.push(e);for(var n=0;n<r.normalizedDeps.length;n++){var o=r.normalizedDeps[n];-1==indexOf.call(t,o)&&l(o,t,a)}r.evaluated||(r.evaluated=!0,r.execute.call(a.global),delete r.execute)}}if("undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),!e.__exec)throw"loader.__exec(load) needs to be provided for loader.register. See SystemJS core for an implementation example.";var u;e.defined=e.defined||{},e.register=a;var d=/System\.register/,c=e.fetch;e.fetch=function(e){var t=this;return t.defined&&t.defined[e.name]?"":c(e)};var f=e.translate;e.translate=function(t){return e.register=a,t.metadata.deps=t.metadata.deps||[],("register"==t.metadata.format||!t.metadata.format&&t.source.match(d))&&(t.metadata.format="register"),f.call(this,t)};var m=e.instantiate;e.instantiate=function(e){var a,r=this;if(r.defined[e.name]?r.defined[e.name]=a=r.defined[e.name]:e.metadata.execute?r.defined[e.name]=a={deps:e.metadata.deps||[],execute:e.metadata.execute,executingRequire:e.metadata.executingRequire}:"register"==e.metadata.format&&(u=null,r.__exec(e),u&&(r.defined[e.name]=a=u)),!a)return m.call(this,e);a.deps=t(a.deps);for(var o=[],i=0;i<a.deps.length;i++)o.push(Promise.resolve(r.normalize(a.deps[i],e.name)));return Promise.all(o).then(function(t){return a.normalizedDeps=t,a.depMap=[],a.asdfasdf="asdf"+Math.random(),{deps:a.deps,execute:function(){if(a.esmodule)return delete r.defined[e.name],a.esmodule;n(e.name,r),l(e.name,[],r),delete r.defined[e.name];var t=Module(a.module);for(var o in r.defined)r.defined[o].execute==a.execute&&(r.defined[o].esmodule=t);return t}}})}}function r(e){var t=e.instantiate;e.instantiate=function(e){var a=this;if("global"==e.metadata.format||!e.metadata.format){e.metadata.deps=e.metadata.deps||[];var r=e.metadata.deps,n=a.moduleGlobals=a.moduleGlobals||{},o=e.metadata.exports,i=e.metadata.init;e.metadata.execute=function(t,s){for(var l=a.global.hasOwnProperty,u=0;u<r.length;u++){var d=n[r[u]];if(d)for(var c in d)a.global[c]=d[c]}var f={};for(var m in a.global)(!l||a.global.hasOwnProperty(m))&&(f[m]=a.global[m]);o&&(e.source+='\nthis["'+o+'"] = '+o),a.__exec(e);var p;if(i){for(var g=[],u=0;u<r.length;u++)g.push(t(r[u]));p=i.apply(a.global,g)}if(o&&!p){var h=o.split(".")[0];p=eval.call(a.global,o),s[h]=a.global[h]}else for(var m in a.global)(l||"sessionStorage"!=m&&"localStorage"!=m&&"clipboardData"!=m&&"frames"!=m)&&(l&&!a.global.hasOwnProperty(m)||m==a.global||f[m]==a.global[m]||(s[m]=a.global[m],p?p!==a.global[m]&&(p=!1):p!==!1&&(p=a.global[m])));n[e.name]=s;var v=p?p:s;return{__useDefault:!0,"default":v}}}return t.call(a,e)}}function n(e){function t(e){a.lastIndex=0,r.lastIndex=0;for(var t,o=[],e=e.replace(n,"");t=r.exec(e);)o.push(t[2]||t[3]);return o}var a=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/,r=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g,n=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,o=e.translate;e.translate=function(e){var a=this;return a._getCJSDeps||(a._getCJSDeps=t),o.call(a,e)};var i=function(){},s={nextTick:function(e){setTimeout(e,7)},browser:"undefined"!=typeof window,env:{},argv:[],on:i,once:i,off:i,emit:i,cwd:function(){return"/"}};e.set("@@nodeProcess",Module(s));var l=e.instantiate;e.instantiate=function(n){return n.metadata.format||(a.lastIndex=0,r.lastIndex=0,(r.exec(n.source)||a.exec(n.source))&&(n.metadata.format="cjs")),"cjs"==n.metadata.format&&(n.metadata.deps=n.metadata.deps?n.metadata.deps.concat(t(n.source)):n.metadata.deps,n.metadata.executingRequire=!0,n.metadata.execute=function(t,a){var r=n.address.split("/");r.pop(),r=r.join("/");var o=e.global._g={global:e.global,exports:a,module:{exports:a},process:s,require:t,__filename:n.address,__dirname:r},i="";for(var l in o)i+="var "+l+" = _g."+l+";";n.source=i+n.source,delete e.global.define,e.__exec(n),e.global._g=void 0;var u=o.module.exports;return u&&u.__esModule?u:void 0!==u?{__useDefault:!0,"default":u}:void 0}),l.call(this,n)}}function o(e){function t(e,a,r,n){var o=this;if("object"==typeof e&&!(e instanceof Array))return t.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e){var i=o.get(e);return i.__useDefault?i["default"]:i}throw"Invalid require"}Promise.all(e.map(function(e){return o["import"](e,n)})).then(function(e){a.apply(null,e)},r)}function a(e,a,r){return function(n,o,i){return"string"==typeof n?a(n):t.call(r,n,o,i,{name:e})}}function r(e){e.global.define&&e.global.define.loader==e||(e.global.define=function(t,r,n){if("string"!=typeof t&&(n=r,r=t,t=null),!(r instanceof Array)){if(n=r,!e._getCJSDeps)throw"AMD extension needs CJS extension for AMD CJS support";r=["require","exports","module"].concat(e._getCJSDeps(n.toString()))}if("function"!=typeof n&&(n=function(e){return function(){return e}}(n)),!t&&o)throw"Multiple defines for anonymous module";var i,s,l;-1!=(i=indexOf.call(r,"require"))&&r.splice(i,1),-1!=(s=indexOf.call(r,"exports"))&&r.splice(s,1),-1!=(l=indexOf.call(r,"module"))&&r.splice(l,1),o={deps:r,execute:function(t,o,u){for(var d=[],c=0;c<r.length;c++)d.push(t(r[c]));var f;-1!=l&&d.splice(l,0,o,f={id:u,uri:e.baseURL+u,config:function(){return{}},exports:o}),-1!=s&&d.splice(s,0,o),-1!=i&&d.splice(i,0,a(u,t,e));var m=n.apply(e.global,d);return m=m||f&&f.exports,m&&m.__esModule?m:void 0!==m?{__useDefault:!0,"default":m}:void 0}},t&&(e.defined[t]=o)},e.global.define.amd={},e.global.define.loader=e)}var n=/(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;e.require=t;var o,i=e.instantiate;e.instantiate=function(e){var t=this;if("amd"==e.metadata.format||!e.metadata.format&&e.source.match(n)){if(e.metadata.format="amd",r(t),o=null,t.global.module=void 0,t.global.exports=void 0,t.__exec(e),!o)throw"AMD module "+e.name+" did not define";e.metadata.deps=e.metadata.deps?e.metadata.deps.concat(o.deps):o.deps,e.metadata.execute=o.execute}return i.call(t,e)}}function i(e){function t(e,t){var a=t.split("/"),r=e.split("/");if(a.length>r.length)return 0;for(var n=0;n<a.length;n++)if(r[n]!=a[n])return 0;return a.length}function a(e,a,r){var n,o,i,s,l=0,u=0;if(a)for(var d in r.map){var c=r.map[d];if("object"==typeof c&&!(t(a,d)<=u))for(var f in c)t(e,f)<=l||(n=f,l=f.split("/").length,o=d,u=d.split("/").length)}n&&(s=e.split("/"),i=s.splice(l,s.length-l).join("/"),e=r.map[o][n]+(i?"/"+i:""),l=0);for(var d in r.map){var c=r.map[d];"string"==typeof c&&(t(e,d)<=l||(n=d,l=d.split("/").length))}return l?(s=e.split("/"),i=s.splice(l,s.length-l).join("/"),r.map[n]+(i?"/"+i:"")):e}e.map=e.map||{};var r=e.normalize;e.normalize=function(e,t,n){var o=this;return o.map||(o.map={}),Promise.resolve(r.call(o,e,t,n)).then(function(e){return a(e,t,o)})}}function s(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=e.normalize;e.normalize=function(e,a,r){var n,o=this;return a&&-1!=(n=a.indexOf("!"))&&(a=a.substr(0,n)),Promise.resolve(t.call(o,e,a,r)).then(function(e){var t=e.lastIndexOf("!");if(-1!=t){var n=e.substr(0,t),i=e.substr(t+1)||n.substr(n.lastIndexOf(".")+1);return new Promise(function(e){e(o.normalize(i,a,r))}).then(function(e){return i=e,o.normalize(n,a,r)}).then(function(e){return e+"!"+i})}return e})};var a=e.locate;e.locate=function(e){var t=this,r=e.name,n=r.lastIndexOf("!");if(-1!=n){var o=r.substr(n+1);e.name=r.substr(0,n);var i=t.pluginLoader||t;return i["import"](o).then(function(){var a=i.get(o);return a=a["default"]||a,e.metadata.plugin=a,e.metadata.pluginName=o,e.metadata.pluginArgument=e.name,a.locate?a.locate.call(t,e):new Promise(function(a){a(t.locate(e))}).then(function(e){return e.substr(0,e.length-3)})})}return a.call(this,e)};var r=e.fetch;e.fetch=function(e){var t=this;return e.metadata.plugin&&e.metadata.plugin.fetch?Promise.resolve(e.metadata.plugin.fetch.call(t,e)).then(function(a){return void 0===a?r.call(t,e):a}):r.call(t,e)};var n=e.translate;e.translate=function(e){var t=this;return e.metadata.plugin&&e.metadata.plugin.translate?Promise.resolve(e.metadata.plugin.translate.call(t,e)).then(function(a){return void 0===a?n.call(t,e):a}):n.call(t,e)};var o=e.instantiate;e.instantiate=function(e){return e.metadata.plugin&&e.metadata.plugin.instantiate?Promise.resolve(e.metadata.plugin.instantiate.call(this,e)).then(function(t){return void 0===t?o.call(this,e):t}):o.call(this,e)}}function l(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),e.bundles=e.bundles||{};var t=e.fetch;e.fetch=function(a){e.bundles||(e.bundles={});for(var r in e.bundles)if(-1!=indexOf.call(e.bundles[r],a.name))return Promise.resolve(e.normalize(r)).then(function(t){return e.bundles[t]=e.bundles[t]||e.bundles[r],e.load(t)}).then(function(){return""});return t.apply(this,arguments)}}function u(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,a=function(e,t){var a,r=e.split("."),n=t.split(".");r[2]&&-1!=(a=indexOf.call(r[2],"-"))&&r.splice(2,1,r[2].substr(0,a),r[2].substr(a+1)),n[2]&&-1!=(a=indexOf.call(n[2],"-"))&&n.splice(2,1,n[2].substr(0,a),n[2].substr(a+1));for(var o=0;o<Math.max(r.length,n.length);o++){if(!r[o])return 1;if(!n[o])return-1;if(r[o]!=n[o])return parseInt(r[o])>parseInt(n[o])?1:-1}return 0};e.versions=e.versions||{};var r=e.normalize;e.normalize=function(n,o,i){e.versions||(e.versions={});var s=this.versions;return Promise.resolve(r.call(this,n,o,i)).then(function(e){var r,n,o,i,l=e.indexOf("@");if(-1==l){for(var u in s)if(i=s[u],e.substr(0,u.length)==u&&(o=e.substr(u.length,1),!o||"/"==o))return u+"@"+("string"==typeof i?i:i[i.length-1])+e.substr(u.length);return e}r=e.substr(l+1).split("/")[0];var d,c=r.length;if("^"==r.substr(0,1)&&(r=r.substr(1),d=!0),n=r.match(t),!n)return e;d&&(n[2]||(d=!1),n[3]||(n[2]>0?n[3]="0":d=!1)),d&&(n[1]>0?(n[2]||(r=n[1]+".0.0"),n[3]||(r=n[1]+".0"),d=r,n=[n[1]]):n[2]>0?(d=r,n=[0,n[2]]):(d=!1,n=[0,0,n[3]]),r=n.join("."));var f=e.substr(0,l);if(i=s[f]||[],"string"==typeof i&&(i=[i]),!n[3]||d)for(var m=i.length-1;m>=0;m--){var p=i[m];if(p.substr(0,r.length)==r&&p.substr(r.length,1).match(/^[\.\-]?$/)&&(!d||d&&-1!=a(p,d)))return f+"@"+p+e.substr(f.length+c+1)}return-1==indexOf.call(i,r)&&(i.push(r),i.sort(a),e=f+"@"+r+e.substr(f.length+c+1),n[3]&&-1!=(l=indexOf.call(i,n[1]+"."+n[2]))&&i.splice(l,1),n[2]&&-1!=(l=indexOf.call(i,n[1]))&&i.splice(l,1),s[f]=1==i.length?i[0]:i),e})}}__$global.upgradeSystemLoader=void 0,e(System),t(System),a(System),r(System),n(System),o(System),i(System),s(System),l(System),u(System),System.baseURL=__$curScript.getAttribute("data-baseurl")||System.baseURL;var d=__$curScript.getAttribute("data-config");""===d&&(d=System.baseURL+"config.json");var c=__$curScript.getAttribute("data-main");System.paths["@traceur"]||(System.paths["@traceur"]="undefined"!=typeof __$curScript&&__$curScript.getAttribute("data-traceur-src")),(d?Promise.resolve(System.fetch.call(System,{address:d,metadata:{}})).then(JSON.parse).then(System.config):Promise.resolve()).then(function(){return c?System["import"](c):void 0})["catch"](function(e){setTimeout(function(){throw e})})};var __$curScript;!function(e){if("undefined"!=typeof window){var t=document.getElementsByTagName("script");if(__$curScript=t[t.length-1],!e.System||e.System.registerModule){var a=__$curScript.src,r=a.substr(0,a.lastIndexOf("/")+1);document.write('<script type="text/javascript" src="'+r+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}else e.upgradeSystemLoader()}else{var n=require("es6-module-loader");e.System=n.System,e.Loader=n.Loader,e.Module=n.Module,module.exports=e.System,e.upgradeSystemLoader()}}(__$global)}("undefined"!=typeof window?window:global);
\ No newline at end of file
+!function(__$global){function __eval(__source,__global,__address,__sourceMap){try{__source="with(__global) { (function() { "+__source+" \n }).call(__global); }\n//# sourceURL="+__address+(__sourceMap?"\n//# sourceMappingURL="+__sourceMap:""),eval(__source)}catch(e){throw"SyntaxError"==e.name&&(e.message="Evaluating "+__address+"\n	"+e.message),e}}var indexOf=Array.prototype.indexOf||function(e){for(var t=0,a=this.length;a>t;t++)if(this[t]===e)return t;return-1};__$global.upgradeSystemLoader=function(){function e(e){function t(e){var t=this;"@traceur"==e.name&&(m=System,p=Module);var a,n=e.source.lastIndexOf("\n");-1!=n&&"//# sourceMappingURL="==e.source.substr(n+1,21)&&(a=r(e.address,e.source.substr(n+22))),__eval(e.source,t.global,e.address,a),"@traceur"==e.name&&(t.global.traceurSystem=t.global.System,t.global.System=m)}function a(e){var t=String(e).replace(/^\s+|\s+$/g,"").match(/^([^:\/?#]+:)?(\/\/(?:[^:@]*(?::[^:@]*)?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);return t?{href:t[0]||"",protocol:t[1]||"",authority:t[2]||"",host:t[3]||"",hostname:t[4]||"",port:t[5]||"",pathname:t[6]||"",search:t[7]||"",hash:t[8]||""}:null}function r(e,t){function r(e){var t=[];return e.replace(/^(\.\.?(\/|$))+/,"").replace(/\/(\.(\/|$))+/g,"/").replace(/\/\.\.$/,"/../").replace(/\/?[^\/]*/g,function(e){"/.."===e?t.pop():t.push(e)}),t.join("").replace(/^\//,"/"===e.charAt(0)?"/":"")}return t=a(t||""),e=a(e||""),t&&e?(t.protocol||e.protocol)+(t.protocol||t.authority?t.authority:e.authority)+r(t.protocol||t.authority||"/"===t.pathname.charAt(0)?t.pathname:t.pathname?(e.authority&&!e.pathname?"/":"")+e.pathname.slice(0,e.pathname.lastIndexOf("/")+1)+t.pathname:e.pathname)+(t.protocol||t.authority||t.pathname?t.search:t.search||e.search)+t.hash:null}var n=e["import"];e["import"]=function(e,t){return n.call(this,e,t).then(function(e){return e.__useDefault?e["default"]:e})},e.set("@empty",Module({})),e.config=function(e){for(var t in e){var a=e[t];if("object"==typeof a){this[t]=this[t]||{};for(var r in a)this[t][r]=a[r]}else this[t]=a}};var o;if("undefined"==typeof window)o=__dirname+"/";else if(o=document.baseURI,!o){var i=document.getElementsByTagName("base");o=i[0]&&i[0].href||window.location.href}var s,l=e.locate;e.locate=function(e){return this.baseURL!=s&&(s=r(o,this.baseURL),"/"!=s.substr(s.length-1,1)&&(s+="/"),this.baseURL=s),Promise.resolve(l.call(this,e))};var u=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,d=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,c=e.translate;e.translate=function(e){var a=this;if(a.__exec=t,"@traceur"==e.name)return c.call(a,e);var r;if(!a.global.traceur&&("es6"==e.metadata.format||!e.metadata.format)&&(r=e.source.match(u))){var n=r[1]||r[2];e.metadata.deps=[n],e.metadata.execute=function(e){return e(n)}}return"es6"!=e.metadata.format&&(e.metadata.format||!e.source.match(d))||(e.metadata.format="es6",a.global.traceur)?c.call(a,e):a["import"]("@traceur").then(function(){return c.call(a,e)})};var f=e.instantiate;e.instantiate=function(e){var t=this;return"@traceur"==e.name?(t.__exec(e),{deps:[],execute:function(){return Module({})}}):f.call(t,e)};var m,p;e.__exec=t}function t(e){function t(e,t){var a=e.meta&&e.meta[t.name];if(a)for(var r in a)t.metadata[r]=t.metadata[r]||a[r]}var a=/^(\s*\/\*.*\*\/|\s*\/\/[^\n]*|\s*"[^"]+"\s*;?|\s*'[^']+'\s*;?)+/,r=/\/\*.*\*\/|\/\/[^\n]*|"[^"]+"\s*;?|'[^']+'\s*;?/g;e.meta={};var n=e.locate;e.locate=function(e){return t(this,e),n.call(this,e)};var o=e.translate;e.translate=function(e){var n=e.source.match(a);if(n)for(var i=n[0].match(r),s=0;s<i.length;s++){var l=i[s].length,u=i[s].substr(0,1);if(";"==i[s].substr(l-1,1)&&l--,'"'==u||"'"==u){var d=i[s].substr(1,i[s].length-3),c=d.substr(0,d.indexOf(" "));if(c){var f=d.substr(c.length+1,d.length-c.length-1);e.metadata[c]instanceof Array?e.metadata[c].push(f):e.metadata[c]=f}}}return t(this,e),o.call(this,e)}}function a(e){function t(e){for(var t=[],a=0;a<e.length;a++)-1==indexOf.call(t,e[a])&&t.push(e[a]);return t}function a(t,a,r){if("string"!=typeof t&&(r=a,a=t,t=null),0==r.length)throw"Invalid System.register form. Ensure setting --modules=instantiate if using Traceur.";e.defined||(e.defined={}),u={deps:a,declare:r,declarative:!0},t&&(e.defined[t]=u)}function r(e,t,a){if(a[e.groupIndex]=a[e.groupIndex]||[],-1==indexOf.call(a[e.groupIndex],e)){a[e.groupIndex].push(e);for(var n=0;n<e.normalizedDeps.length;n++){var o=e.normalizedDeps[n],i=t.defined[o];if(i){var s=e.groupIndex+(i.declarative!=e.declarative);if(void 0===i.groupIndex||i.groupIndex<s){if(i.groupIndex&&(a[i.groupIndex].splice(a[i.groupIndex].indexOf(i),1),0==a[i.groupIndex].length))throw new TypeError("Mixed dependency cycle detected");i.groupIndex=s}r(i,t,a)}}}}function n(e,t){var a=t.defined[e];a.groupIndex=0;var n=[];r(a,t,n);for(var i=!!a.declarative==n.length%2,l=n.length-1;l>=0;l--){for(var u=n[l],d=0;d<u.length;d++){var c=u[d];i?o(c,t):s(c,t)}i=!i}}function o(e,t){if(!e.module){var a=[],r=e.declare.call(t.global,a);e.module=r.exports,e.exportStar=r.exportStar,e.execute=r.execute;for(var n=e.module,i=0;i<e.normalizedDeps.length;i++){var s=e.normalizedDeps[i],l=t.defined[s];l?l.module?depModule=l.module:(o(l,t),depModule=l.module):depModule=t.get(s),e.exportStar&&-1!=indexOf.call(e.exportStar,e.normalizedDeps[i])&&!function(e){for(var t in e)(function(t){Object.defineProperty(n,t,{enumerable:!0,get:function(){return e[t]},set:function(a){e[t]=a}})})(t)}(depModule),a[i]=depModule}}}function i(e,t){var a,r=t.defined[e];return r?(r.declarative?l(e,[],t):r.evaluated||s(r,t),a=r.module):a=t.get(e),a.__useDefault?a["default"]:a}function s(e,t){if(!e.module){if(e.module={},!e.executingRequire)for(var a=0;a<e.normalizedDeps.length;a++){var r=e.normalizedDeps[a],n=t.defined[r];n&&s(n,t)}try{e.evaluated=!0;var o=e.execute(function(a){for(var r=0;r<e.deps.length;r++)if(e.deps[r]==a)return i(e.normalizedDeps[r],t)},e.module,name)}catch(l){throw l}o&&(e.module=o)}}function l(e,t,a){var r=a.defined[e];if(!r.evaluated&&r.declarative){t.push(e);for(var n=0;n<r.normalizedDeps.length;n++){var o=r.normalizedDeps[n];-1==indexOf.call(t,o)&&(a.defined[o]?l(o,t,a):a.get(o))}r.evaluated||(r.evaluated=!0,r.execute.call(a.global),delete r.execute)}}if("undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),!e.__exec)throw"loader.__exec(load) needs to be provided for loader.register. See SystemJS core for an implementation example.";var u;e.defined=e.defined||{},e.register=a;var d=/System\.register/,c=e.fetch;e.fetch=function(e){var t=this;return t.defined&&t.defined[e.name]?"":c(e)};var f=e.translate;e.translate=function(t){return e.register=a,t.metadata.deps=t.metadata.deps||[],("register"==t.metadata.format||!t.metadata.format&&t.source.match(d))&&(t.metadata.format="register"),f.call(this,t)};var m=e.instantiate;e.instantiate=function(e){var a,r=this;if(r.defined[e.name]?r.defined[e.name]=a=r.defined[e.name]:e.metadata.execute?r.defined[e.name]=a={deps:e.metadata.deps||[],execute:e.metadata.execute,executingRequire:e.metadata.executingRequire}:"register"==e.metadata.format&&(u=null,r.__exec(e),u&&(r.defined[e.name]=a=u)),!a)return m.call(this,e);a.deps=t(a.deps);for(var o=[],i=0;i<a.deps.length;i++)o.push(Promise.resolve(r.normalize(a.deps[i],e.name)));return Promise.all(o).then(function(t){return a.normalizedDeps=t,a.depMap=[],a.asdfasdf="asdf"+Math.random(),{deps:a.deps,execute:function(){if(a.esmodule)return delete r.defined[e.name],a.esmodule;n(e.name,r),l(e.name,[],r),delete r.defined[e.name];var t=Module(a.module);for(var o in r.defined)r.defined[o].execute==a.execute&&(r.defined[o].esmodule=t);return t}}})}}function r(e){var t=e.instantiate;e.instantiate=function(e){var a=this;if("global"==e.metadata.format||!e.metadata.format){e.metadata.deps=e.metadata.deps||[];var r=e.metadata.deps,n=a.moduleGlobals=a.moduleGlobals||{},o=e.metadata.exports,i=e.metadata.init;e.metadata.execute=function(t,s){for(var l=a.global.hasOwnProperty,u=0;u<r.length;u++){var d=n[r[u]];if(d)for(var c in d)a.global[c]=d[c]}var f={};for(var m in a.global)(!l||a.global.hasOwnProperty(m))&&(f[m]=a.global[m]);o&&(e.source+='\nthis["'+o+'"] = '+o),a.__exec(e);var p;if(i){for(var g=[],u=0;u<r.length;u++)g.push(t(r[u]));p=i.apply(a.global,g)}if(o&&!p){var h=o.split(".")[0];p=eval.call(a.global,o),s[h]=a.global[h]}else for(var m in a.global)(l||"sessionStorage"!=m&&"localStorage"!=m&&"clipboardData"!=m&&"frames"!=m)&&(l&&!a.global.hasOwnProperty(m)||m==a.global||f[m]==a.global[m]||(s[m]=a.global[m],p?p!==a.global[m]&&(p=!1):p!==!1&&(p=a.global[m])));n[e.name]=s;var v=p?p:s;return{__useDefault:!0,"default":v}}}return t.call(a,e)}}function n(e){function t(e){a.lastIndex=0,r.lastIndex=0;for(var t,o=[],e=e.replace(n,"");t=r.exec(e);)o.push(t[2]||t[3]);return o}var a=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/,r=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g,n=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,o=e.translate;e.translate=function(e){var a=this;return a._getCJSDeps||(a._getCJSDeps=t),o.call(a,e)};var i=function(){},s={nextTick:function(e){setTimeout(e,7)},browser:"undefined"!=typeof window,env:{},argv:[],on:i,once:i,off:i,emit:i,cwd:function(){return"/"}};e.set("@@nodeProcess",Module(s));var l=e.instantiate;e.instantiate=function(n){return n.metadata.format||(a.lastIndex=0,r.lastIndex=0,(r.exec(n.source)||a.exec(n.source))&&(n.metadata.format="cjs")),"cjs"==n.metadata.format&&(n.metadata.deps=n.metadata.deps?n.metadata.deps.concat(t(n.source)):n.metadata.deps,n.metadata.executingRequire=!0,n.metadata.execute=function(t,a){var r=n.address.split("/");r.pop(),r=r.join("/");var o=e.global._g={global:e.global,exports:a,module:{exports:a},process:s,require:t,__filename:n.address,__dirname:r},i="";for(var l in o)i+="var "+l+" = _g."+l+";";n.source=i+n.source,delete e.global.define,e.__exec(n),e.global._g=void 0;var u=o.module.exports;return u&&u.__esModule?u:void 0!==u?{__useDefault:!0,"default":u}:void 0}),l.call(this,n)}}function o(e){function t(e,a,r,n){var o=this;if("object"==typeof e&&!(e instanceof Array))return t.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e){var i=o.get(e);return i.__useDefault?i["default"]:i}throw"Invalid require"}Promise.all(e.map(function(e){return o["import"](e,n)})).then(function(e){a.apply(null,e)},r)}function a(e,a,r){return function(n,o,i){return"string"==typeof n?a(n):t.call(r,n,o,i,{name:e})}}function r(e){e.global.define&&e.global.define.loader==e||(e.global.define=function(t,r,n){if("string"!=typeof t&&(n=r,r=t,t=null),!(r instanceof Array)){if(n=r,!e._getCJSDeps)throw"AMD extension needs CJS extension for AMD CJS support";r=["require","exports","module"].concat(e._getCJSDeps(n.toString()))}if("function"!=typeof n&&(n=function(e){return function(){return e}}(n)),!t&&o)throw"Multiple defines for anonymous module";var i,s,l;-1!=(i=indexOf.call(r,"require"))&&r.splice(i,1),-1!=(s=indexOf.call(r,"exports"))&&r.splice(s,1),-1!=(l=indexOf.call(r,"module"))&&r.splice(l,1),o={deps:r,execute:function(t,o,u){for(var d=[],c=0;c<r.length;c++)d.push(t(r[c]));var f;-1!=l&&d.splice(l,0,o,f={id:u,uri:e.baseURL+u,config:function(){return{}},exports:o}),-1!=s&&d.splice(s,0,o),-1!=i&&d.splice(i,0,a(u,t,e));var m=n.apply(e.global,d);return m=m||f&&f.exports,m&&m.__esModule?m:void 0!==m?{__useDefault:!0,"default":m}:void 0}},t&&(e.defined[t]=o)},e.global.define.amd={},e.global.define.loader=e)}var n=/(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;e.require=t;var o,i=e.instantiate;e.instantiate=function(e){var t=this;if("amd"==e.metadata.format||!e.metadata.format&&e.source.match(n)){if(e.metadata.format="amd",r(t),o=null,t.global.module=void 0,t.global.exports=void 0,t.__exec(e),!o)throw"AMD module "+e.name+" did not define";e.metadata.deps=e.metadata.deps?e.metadata.deps.concat(o.deps):o.deps,e.metadata.execute=o.execute}return i.call(t,e)}}function i(e){function t(e,t){var a=t.split("/"),r=e.split("/");if(a.length>r.length)return 0;for(var n=0;n<a.length;n++)if(r[n]!=a[n])return 0;return a.length}function a(e,a,r){var n,o,i,s,l=0,u=0;if(a)for(var d in r.map){var c=r.map[d];if("object"==typeof c&&!(t(a,d)<=u))for(var f in c)t(e,f)<=l||(n=f,l=f.split("/").length,o=d,u=d.split("/").length)}n&&(s=e.split("/"),i=s.splice(l,s.length-l).join("/"),e=r.map[o][n]+(i?"/"+i:""),l=0);for(var d in r.map){var c=r.map[d];"string"==typeof c&&(t(e,d)<=l||(n=d,l=d.split("/").length))}return l?(s=e.split("/"),i=s.splice(l,s.length-l).join("/"),r.map[n]+(i?"/"+i:"")):e}e.map=e.map||{};var r=e.normalize;e.normalize=function(e,t,n){var o=this;return o.map||(o.map={}),Promise.resolve(r.call(o,e,t,n)).then(function(e){return a(e,t,o)})}}function s(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=e.normalize;e.normalize=function(e,a,r){var n,o=this;return a&&-1!=(n=a.indexOf("!"))&&(a=a.substr(0,n)),Promise.resolve(t.call(o,e,a,r)).then(function(e){var t=e.lastIndexOf("!");if(-1!=t){var n=e.substr(0,t),i=e.substr(t+1)||n.substr(n.lastIndexOf(".")+1);return new Promise(function(e){e(o.normalize(i,a,r))}).then(function(e){return i=e,o.normalize(n,a,r)}).then(function(e){return e+"!"+i})}return e})};var a=e.locate;e.locate=function(e){var t=this,r=e.name,n=r.lastIndexOf("!");if(-1!=n){var o=r.substr(n+1);e.name=r.substr(0,n);var i=t.pluginLoader||t;return i["import"](o).then(function(){var a=i.get(o);return a=a["default"]||a,e.metadata.plugin=a,e.metadata.pluginName=o,e.metadata.pluginArgument=e.name,a.locate?a.locate.call(t,e):new Promise(function(a){a(t.locate(e))}).then(function(e){return e.substr(0,e.length-3)})})}return a.call(this,e)};var r=e.fetch;e.fetch=function(e){var t=this;return e.metadata.plugin&&e.metadata.plugin.fetch?Promise.resolve(e.metadata.plugin.fetch.call(t,e)).then(function(a){return void 0===a?r.call(t,e):a}):r.call(t,e)};var n=e.translate;e.translate=function(e){var t=this;return e.metadata.plugin&&e.metadata.plugin.translate?Promise.resolve(e.metadata.plugin.translate.call(t,e)).then(function(a){return void 0===a?n.call(t,e):a}):n.call(t,e)};var o=e.instantiate;e.instantiate=function(e){return e.metadata.plugin&&e.metadata.plugin.instantiate?Promise.resolve(e.metadata.plugin.instantiate.call(this,e)).then(function(t){return void 0===t?o.call(this,e):t}):o.call(this,e)}}function l(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),e.bundles=e.bundles||{};var t=e.fetch;e.fetch=function(a){e.bundles||(e.bundles={});for(var r in e.bundles)if(-1!=indexOf.call(e.bundles[r],a.name))return Promise.resolve(e.normalize(r)).then(function(t){return e.bundles[t]=e.bundles[t]||e.bundles[r],e.load(t)}).then(function(){return""});return t.apply(this,arguments)}}function u(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,a=function(e,t){var a,r=e.split("."),n=t.split(".");r[2]&&-1!=(a=indexOf.call(r[2],"-"))&&r.splice(2,1,r[2].substr(0,a),r[2].substr(a+1)),n[2]&&-1!=(a=indexOf.call(n[2],"-"))&&n.splice(2,1,n[2].substr(0,a),n[2].substr(a+1));for(var o=0;o<Math.max(r.length,n.length);o++){if(!r[o])return 1;if(!n[o])return-1;if(r[o]!=n[o])return parseInt(r[o])>parseInt(n[o])?1:-1}return 0};e.versions=e.versions||{};var r=e.normalize;e.normalize=function(n,o,i){e.versions||(e.versions={});var s=this.versions;return Promise.resolve(r.call(this,n,o,i)).then(function(e){var r,n,o,i,l=e.indexOf("@");if(-1==l){for(var u in s)if(i=s[u],e.substr(0,u.length)==u&&(o=e.substr(u.length,1),!o||"/"==o))return u+"@"+("string"==typeof i?i:i[i.length-1])+e.substr(u.length);return e}r=e.substr(l+1).split("/")[0];var d,c=r.length;if("^"==r.substr(0,1)&&(r=r.substr(1),d=!0),n=r.match(t),!n)return e;d&&(n[2]||(d=!1),n[3]||(n[2]>0?n[3]="0":d=!1)),d&&(n[1]>0?(n[2]||(r=n[1]+".0.0"),n[3]||(r=n[1]+".0"),d=r,n=[n[1]]):n[2]>0?(d=r,n=[0,n[2]]):(d=!1,n=[0,0,n[3]]),r=n.join("."));var f=e.substr(0,l);if(i=s[f]||[],"string"==typeof i&&(i=[i]),!n[3]||d)for(var m=i.length-1;m>=0;m--){var p=i[m];if(p.substr(0,r.length)==r&&p.substr(r.length,1).match(/^[\.\-]?$/)&&(!d||d&&-1!=a(p,d)))return f+"@"+p+e.substr(f.length+c+1)}return-1==indexOf.call(i,r)&&(i.push(r),i.sort(a),e=f+"@"+r+e.substr(f.length+c+1),n[3]&&-1!=(l=indexOf.call(i,n[1]+"."+n[2]))&&i.splice(l,1),n[2]&&-1!=(l=indexOf.call(i,n[1]))&&i.splice(l,1),s[f]=1==i.length?i[0]:i),e})}}__$global.upgradeSystemLoader=void 0,e(System),t(System),a(System),r(System),n(System),o(System),i(System),s(System),l(System),u(System),System.baseURL=__$curScript.getAttribute("data-baseurl")||System.baseURL;var d=__$curScript.getAttribute("data-config");""===d&&(d=System.baseURL+"config.json");var c=__$curScript.getAttribute("data-main");System.paths["@traceur"]||(System.paths["@traceur"]="undefined"!=typeof __$curScript&&__$curScript.getAttribute("data-traceur-src")),(d?Promise.resolve(System.fetch.call(System,{address:d,metadata:{}})).then(JSON.parse).then(System.config):Promise.resolve()).then(function(){return c?System["import"](c):void 0})["catch"](function(e){setTimeout(function(){throw e})})};var __$curScript;!function(e){if("undefined"!=typeof window){var t=document.getElementsByTagName("script");if(__$curScript=t[t.length-1],!e.System||e.System.registerModule){var a=__$curScript.src,r=a.substr(0,a.lastIndexOf("/")+1);document.write('<script type="text/javascript" src="'+r+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}else e.upgradeSystemLoader()}else{var n=require("es6-module-loader");e.System=n.System,e.Loader=n.Loader,e.Module=n.Module,module.exports=e.System,e.upgradeSystemLoader()}}(__$global)}("undefined"!=typeof window?window:global);
\ No newline at end of file
diff --git a/lib/extension-register.js b/lib/extension-register.js
index 919ee170..77ab7c96 100644
--- a/lib/extension-register.js
+++ b/lib/extension-register.js
@@ -83,12 +83,20 @@ function register(loader) {
       // now we know the entry is in our unlinked linkage group
       var depGroupIndex = entry.groupIndex + (depEntry.declarative != entry.declarative);
 
-      if (depEntry.groupIndex === undefined) {
+      // the group index of an entry is always the maximum
+      if (depEntry.groupIndex === undefined || depEntry.groupIndex < depGroupIndex) {
+        
+        // if already in a group, remove from the old group
+        if (depEntry.groupIndex) {
+          groups[depEntry.groupIndex].splice(groups[depEntry.groupIndex].indexOf(depEntry), 1);
+
+          // if the old group is empty, then we have a mixed depndency cycle
+          if (groups[depEntry.groupIndex].length == 0)
+            throw new TypeError("Mixed dependency cycle detected");
+        }
+
         depEntry.groupIndex = depGroupIndex;
       }
-      else if (depEntry.groupIndex != depGroupIndex) {
-        throw new TypeError('System.register mixed dependency cycle');
-      }
 
       buildGroups(depEntry, loader, groups);
     }
@@ -103,7 +111,7 @@ function register(loader) {
 
     buildGroups(startEntry, loader, groups);
 
-    var curGroupDeclarative = startEntry.declarative == groups.length % 2;
+    var curGroupDeclarative = !!startEntry.declarative == groups.length % 2;
     for (var i = groups.length - 1; i >= 0; i--) {
       var group = groups[i];
       for (var j = 0; j < group.length; j++) {
@@ -249,8 +257,12 @@ function register(loader) {
 
     for (var i = 0; i < entry.normalizedDeps.length; i++) {
       var depName = entry.normalizedDeps[i];
-      if (indexOf.call(seen, depName) == -1)
-        ensureEvaluated(depName, seen, loader);
+      if (indexOf.call(seen, depName) == -1) {
+        if (!loader.defined[depName])
+          loader.get(depName);
+        else
+          ensureEvaluated(depName, seen, loader);
+      }
     }
 
     if (entry.evaluated)
diff --git a/test/test.js b/test/test.js
index 84a1a310..5a751feb 100644
--- a/test/test.js
+++ b/test/test.js
@@ -361,12 +361,10 @@ asyncTest('System.register Circular', function() {
   }, err);
 });
 
-
-
-asyncTest('AMD, CJS circular, System.register circular, ES6 circular', function() {
+asyncTest('AMD -> System.register circular -> ES6', function() {
+  System['import']('tests/all-layers1').then(function(m) {
+    ok(m == true)
+    start();
+  }, err);
 });
-/*
-asyncTest('CJS loading ES6 circular, CJS circular, System.register circular', function() {
-
-}); */
 
diff --git a/test/tests/all-layers1.js b/test/tests/all-layers1.js
new file mode 100644
index 00000000..21880b15
--- /dev/null
+++ b/test/tests/all-layers1.js
@@ -0,0 +1,3 @@
+define(['./all-layers2'], function(al2) {
+  return al2.q == 10 && al2.r == 5;
+});
\ No newline at end of file
diff --git a/test/tests/all-layers2.js b/test/tests/all-layers2.js
new file mode 100644
index 00000000..e5dd5406
--- /dev/null
+++ b/test/tests/all-layers2.js
@@ -0,0 +1,39 @@
+System.register(["./all-layers3"], function($__0) {
+  "use strict";
+  var q,
+      r;
+  function p() {
+    if (q)
+      r = $__0[0]["c"];
+    else
+      q = $__0[0]["c"];
+  }
+  return {
+    exports: {
+      get q() {
+        return q;
+      },
+      get r() {
+        return r;
+      },
+      get p() {
+        return p;
+      },
+      set q(value) {
+        q = value;
+      },
+      set r(value) {
+        r = value;
+      },
+      set p(value) {
+        p = value;
+      }
+    },
+    execute: function() {
+      ;
+      $__0[0]["c"] = 5;
+      ;
+      p();
+    }
+  };
+});
diff --git a/test/tests/all-layers3.js b/test/tests/all-layers3.js
new file mode 100644
index 00000000..dd41c2a5
--- /dev/null
+++ b/test/tests/all-layers3.js
@@ -0,0 +1,19 @@
+System.register(["./all-layers2", "./all-layers4"], function($__0) {
+  "use strict";
+  var c;
+  return {
+    exports: {
+      get c() {
+        return c;
+      },
+      set c(value) {
+        c = value;
+      }
+    },
+    execute: function() {
+      c = $__0[1]["c"];
+      ;
+      $__0[0]["p"]();
+    }
+  };
+});
diff --git a/test/tests/all-layers4.js b/test/tests/all-layers4.js
new file mode 100644
index 00000000..4a2d7bf8
--- /dev/null
+++ b/test/tests/all-layers4.js
@@ -0,0 +1 @@
+export var c = 10;
\ No newline at end of file