diff --git a/.babelrc b/.babelrc
index f9fc678369..c0a5a8fa58 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,5 +1,6 @@
 {
-  "plugins": ["check-es2015-constants",
+  "plugins": ["fast-async",
+              "check-es2015-constants",
               "transform-es2015-arrow-functions",
               "transform-es2015-block-scoped-functions",
               "transform-es2015-block-scoping",
@@ -15,7 +16,6 @@
               "transform-es2015-shorthand-properties",
               "transform-es2015-spread",
               "transform-es2015-sticky-regex",
-              "transform-es2015-template-literals",
               "transform-es2015-unicode-regex",
-              "transform-regenerator"]
+            ]
 }
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 2c9e121ee9..646fe3ad7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ node_modules
 reports
 soljson.js
 npm-debug.log*
+babelify-src
diff --git a/package.json b/package.json
index 2e98b348bb..1c13b6d263 100644
--- a/package.json
+++ b/package.json
@@ -10,16 +10,17 @@
     "browser-test-remote-ie": "nightwatch --config nightwatch.js --env ie",
     "browser-test-remote-safari": "nightwatch --config nightwatch.js --env safari",
     "browser-test-remote-parallel": "nightwatch --config nightwatch.js --env safari,ie,default,chrome",
-    "build": "mkdir -p build; browserify src/index.js -g yo-yoify -o build/app.js; babel build/app.js --out-file build/app.js",
+    "build": "mkdir -p build; browserify src/index.js -g yo-yoify -o build/app.js -t [ babelify ]; babel --plugins=transform-es2015-template-literals build/app.js --out-file build/app.js",
     "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/",
     "downloadsolc": "rm soljson.js; wget https://ethereum.github.io/solc-bin/soljson.js",
     "lint": "standard",
     "serve": "http-server .",
-    "test": "node test/index.js"
+    "test": "standard; babel src --out-dir babelify-src; node test/index.js"
   },
   "devDependencies": {
     "async": "^2.1.2",
     "babel-cli": "^6.16.0",
+    "babel-eslint": "^7.1.1",
     "babel-plugin-check-es2015-constants": "^6.8.0",
     "babel-plugin-transform-es2015-arrow-functions": "^6.8.0",
     "babel-plugin-transform-es2015-block-scoped-functions": "^6.8.0",
@@ -39,6 +40,7 @@
     "babel-plugin-transform-es2015-template-literals": "^6.8.0",
     "babel-plugin-transform-es2015-unicode-regex": "^6.11.0",
     "babel-plugin-transform-regenerator": "^6.16.1",
+    "babelify": "^7.3.0",
     "brace": "^0.8.0",
     "browserify": "^13.0.0",
     "csslint": "^1.0.2",
@@ -49,6 +51,7 @@
     "ethereumjs-tx": "^1.1.1",
     "ethereumjs-util": "^4.4.0",
     "ethereumjs-vm": "^2.0.1",
+    "fast-async": "^6.1.2",
     "http-server": "0.9.0",
     "jquery": "^2.2.0",
     "js-base64": "^2.1.9",
@@ -81,6 +84,7 @@
       "build/",
       "src/mode-solidity.js",
       "soljson.js"
-    ]
+    ],
+    "parser": "babel-eslint"
   }
 }
diff --git a/test/compiler-test.js b/test/compiler-test.js
index ecb5a027da..4664036d97 100644
--- a/test/compiler-test.js
+++ b/test/compiler-test.js
@@ -2,7 +2,7 @@
 
 var test = require('tape')
 
-var Compiler = require('../src/app/compiler')
+var Compiler = require('../babelify-src/app/compiler')
 
 test('compiler.compile smoke', function (t) {
   t.plan(1)
diff --git a/test/gist-handler-test.js b/test/gist-handler-test.js
index 76584e73ca..3ce54ecd14 100644
--- a/test/gist-handler-test.js
+++ b/test/gist-handler-test.js
@@ -2,7 +2,7 @@
 
 var test = require('tape')
 
-var GistHandler = require('../src/app/gist-handler')
+var GistHandler = require('../babelify-src/app/gist-handler')
 
 test('gistHandler.handleLoad with no gist param', function (t) {
   t.plan(1)
diff --git a/test/query-params-test.js b/test/query-params-test.js
index 4240c99507..72bd628136 100644
--- a/test/query-params-test.js
+++ b/test/query-params-test.js
@@ -2,7 +2,7 @@
 
 var test = require('tape')
 
-var QueryParams = require('../src/app/query-params')
+var QueryParams = require('../babelify-src/app/query-params')
 
 test('queryParams.get', function (t) {
   t.plan(2)