diff --git a/.babelrc b/.babelrc
index 307583ffd..628fe652c 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,4 @@
 {
-  "presets": ["es2015", "stage-0", "react"],
-  "plugins": ["transform-runtime", "transform-async-to-generator"]
+  "presets": [["env", { "debug": true }], "react", "stage-0"],
+  "plugins": ["transform-runtime", "transform-async-to-generator", "transform-class-properties"]
 }
diff --git a/package-lock.json b/package-lock.json
index 443e173a9..1a2897a9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3618,9 +3618,9 @@
             }
         },
         "babel-preset-env": {
-            "version": "1.6.1",
-            "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz",
-            "integrity": "sha512-W6VIyA6Ch9ePMI7VptNn2wBM6dbG0eSz25HEiL40nQXCsXGTGZSTZu1Iap+cj3Q0S5a7T9+529l/5Bkvd+afNA==",
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
+            "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
             "requires": {
                 "babel-plugin-check-es2015-constants": "^6.22.0",
                 "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
@@ -3649,7 +3649,7 @@
                 "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
                 "babel-plugin-transform-exponentiation-operator": "^6.22.0",
                 "babel-plugin-transform-regenerator": "^6.22.0",
-                "browserslist": "^2.1.2",
+                "browserslist": "^3.2.6",
                 "invariant": "^2.2.2",
                 "semver": "^5.3.0"
             }
@@ -4664,12 +4664,19 @@
             }
         },
         "browserslist": {
-            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.0.tgz",
-            "integrity": "sha512-mNYp0RNeu1xueGuJFSXkU+K0nH+dBE/gcjtyhtNKfU8hwdrVIfoA7i5iFSjOmzkGdL2QaO7YX9ExiVPE7AY9JA==",
+            "version": "3.2.8",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
+            "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
             "requires": {
-                "caniuse-lite": "^1.0.30000784",
-                "electron-to-chromium": "^1.3.30"
+                "caniuse-lite": "^1.0.30000844",
+                "electron-to-chromium": "^1.3.47"
+            },
+            "dependencies": {
+                "electron-to-chromium": {
+                    "version": "1.3.52",
+                    "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.52.tgz",
+                    "integrity": "sha1-0tnxJwuko7lnuDHEDvcftNmrXOA="
+                }
             }
         },
         "bs58": {
@@ -4996,9 +5003,9 @@
             "integrity": "sha1-MN/YMAnVcE8C3/s3clBo7RKjZrs="
         },
         "caniuse-lite": {
-            "version": "1.0.30000786",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000786.tgz",
-            "integrity": "sha1-G0Jc2FaNgFvFY4veSQXNhjVod0Y="
+            "version": "1.0.30000865",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz",
+            "integrity": "sha512-vs79o1mOSKRGv/1pSkp4EXgl4ZviWeYReXw60XfacPU64uQWZwJT6vZNmxRF9O+6zu71sJwMxLK5JXxbzuVrLw=="
         },
         "capture-stack-trace": {
             "version": "1.0.0",
@@ -13470,9 +13477,9 @@
                     "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
                 },
                 "node-sass": {
-                    "version": "4.9.1",
-                    "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.1.tgz",
-                    "integrity": "sha512-m6H1I6cHXsHsJ7BIWdnJsz9S9gVMyh+/H2cOTXgl2/2WqyyWlBcl4PHJcqrXo5RZVCfCUFqOtjPN0+0XbVHR5Q==",
+                    "version": "4.9.2",
+                    "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.2.tgz",
+                    "integrity": "sha512-LdxoJLZutx0aQXHtWIYwJKMj+9pTjneTcLWJgzf2XbGu0q5pRNqW5QvFCEdm3mc5rJOdru/mzln5d0EZLacf6g==",
                     "requires": {
                         "async-foreach": "^0.1.3",
                         "chalk": "^1.1.1",
@@ -20653,9 +20660,9 @@
             }
         },
         "node-sass": {
-            "version": "4.9.1",
-            "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.1.tgz",
-            "integrity": "sha512-m6H1I6cHXsHsJ7BIWdnJsz9S9gVMyh+/H2cOTXgl2/2WqyyWlBcl4PHJcqrXo5RZVCfCUFqOtjPN0+0XbVHR5Q==",
+            "version": "4.9.2",
+            "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.2.tgz",
+            "integrity": "sha512-LdxoJLZutx0aQXHtWIYwJKMj+9pTjneTcLWJgzf2XbGu0q5pRNqW5QvFCEdm3mc5rJOdru/mzln5d0EZLacf6g==",
             "dev": true,
             "requires": {
                 "async-foreach": "^0.1.3",
diff --git a/package.json b/package.json
index 376f773e5..96b0829db 100644
--- a/package.json
+++ b/package.json
@@ -54,9 +54,19 @@
         "babelify",
         {
           "presets": [
-            "es2015",
+            [
+              "env",
+              {
+                "debug": true
+              }
+            ],
             "stage-0"
           ]
+        },
+        {
+          "plugins": [
+            "transform-class-properties"
+          ]
         }
       ],
       "reactify",
@@ -94,6 +104,7 @@
     "eslint-plugin-react": "^7.4.0",
     "eth-bin-to-ops": "^1.0.1",
     "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master",
+    "eth-ens-namehash": "^2.0.8",
     "eth-hd-keyring": "^2.0.0",
     "eth-json-rpc-filters": "^1.2.6",
     "eth-json-rpc-infura": "^3.0.0",
@@ -142,6 +153,7 @@
     "metamascara": "^2.0.0",
     "metamask-logo": "^2.1.4",
     "mkdirp": "^0.5.1",
+    "multihashes": "^0.4.12",
     "multiplex": "^6.7.0",
     "number-to-bn": "^1.7.0",
     "obj-multiplex": "^1.0.0",
@@ -195,9 +207,7 @@
     "web3": "^0.20.1",
     "web3-provider-engine": "^14.0.5",
     "web3-stream-provider": "^3.0.1",
-    "xtend": "^4.0.1",
-    "multihashes": "^0.4.12",
-    "eth-ens-namehash": "^2.0.8"
+    "xtend": "^4.0.1"
   },
   "devDependencies": {
     "@sentry/cli": "^1.30.3",
@@ -209,6 +219,7 @@
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.23.0",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "babel-register": "^6.7.2",
@@ -274,7 +285,7 @@
     "mocha-jsdom": "^1.1.0",
     "mocha-sinon": "^2.0.0",
     "nock": "^9.0.14",
-    "node-sass": "^4.9.1",
+    "node-sass": "^4.9.2",
     "nsp": "^3.2.1",
     "nyc": "^13.0.0",
     "open": "0.0.5",