diff --git a/.buildpacks b/.buildpacks
index 04ee0498a..d8f2b30ff 100644
--- a/.buildpacks
+++ b/.buildpacks
@@ -1,3 +1,2 @@
 https://github.com/heroku/heroku-buildpack-ruby.git#v142
 https://github.com/heroku/heroku-buildpack-nodejs.git
-
diff --git a/Gemfile.lock b/Gemfile.lock
index d928a2804..3dee2da4a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: git://github.com/plataformatec/devise.git
-  revision: 6720f93d2c54904f10b6e6d6beb51d0b5b330976
+  revision: 88724e10adaf9ffd1d8dbfbaadda2b9d40de756a
   specs:
     devise (4.2.0)
       bcrypt (~> 3.0)
@@ -66,12 +66,12 @@ GEM
     ast (2.3.0)
     bcrypt (3.1.11)
     builder (3.2.2)
-    bullet (5.3.0)
+    bullet (5.4.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
     cane (2.6.2)
       parallel
-    capybara (2.7.1)
+    capybara (2.9.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -90,7 +90,7 @@ GEM
       rest-client (>= 1.6.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.1)
-    code_analyzer (0.4.5)
+    code_analyzer (0.4.7)
       sexp_processor
     code_metrics (0.1.3)
     codeclimate-test-reporter (0.6.0)
@@ -109,7 +109,7 @@ GEM
     concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.20160615)
+    domain_name (0.5.20160826)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
     erubis (2.7.0)
@@ -123,7 +123,7 @@ GEM
       i18n (~> 0.5)
     fattr (2.3.0)
     ffi (1.9.14)
-    flay (2.8.0)
+    flay (2.8.1)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
@@ -148,18 +148,18 @@ GEM
     ice_nine (0.11.2)
     json (1.8.3)
     json_pure (2.0.2)
-    jwt (1.5.4)
+    jwt (1.5.6)
     launchy (2.4.3)
       addressable (~> 2.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    main (6.2.0)
-      arrayfields (>= 4.7.4)
-      chronic (>= 0.6.2)
-      fattr (>= 2.2.0)
-      map (>= 6.1.0)
+    main (6.2.1)
+      arrayfields (~> 4.7, >= 4.7.4)
+      chronic (~> 0.6, >= 0.6.2)
+      fattr (~> 2.2, >= 2.2.0)
+      map (~> 6.1, >= 6.1.0)
     map (6.6.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -195,7 +195,7 @@ GEM
       pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
     parallel (1.9.0)
-    parser (2.3.1.2)
+    parser (2.3.1.4)
       ast (~> 2.2)
     path_expander (1.0.0)
     pkg-config (1.1.7)
@@ -220,7 +220,7 @@ GEM
       railties (= 4.2.7)
       sprockets-rails
     rails-assets-jquery (3.1.0)
-    rails-assets-lodash (4.14.1)
+    rails-assets-lodash (4.16.1)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.7)
@@ -253,14 +253,14 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
-    rake (11.2.2)
+    rake (11.3.0)
     redcard (1.1.0)
     reek (2.2.1)
       parser (~> 2.2)
       rainbow (~> 2.0)
       unparser (~> 0.2.2)
     require_all (1.3.3)
-    responders (2.2.0)
+    responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -272,7 +272,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
+    rspec-core (3.5.3)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -280,7 +280,7 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -315,7 +315,7 @@ GEM
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -324,7 +324,7 @@ GEM
     tilt (2.0.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.1)
+    uglifier (3.0.2)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
diff --git a/lib/tasks/install_frontend.rake b/lib/tasks/install_frontend.rake
index 60d584c7b..2168509ac 100644
--- a/lib/tasks/install_frontend.rake
+++ b/lib/tasks/install_frontend.rake
@@ -9,6 +9,7 @@ namespace :frontend do
      rm -rf /tmp/farmbot_frontend/.git
      cp -R /tmp/farmbot_frontend/* public/ 
      cd public
+     npm install webpack
      npm install --production
      npm run build`
   end
diff --git a/public/karma.config.js b/public/karma.config.js
new file mode 100644
index 000000000..6b2477d0f
--- /dev/null
+++ b/public/karma.config.js
@@ -0,0 +1,18 @@
+var path = require('path');
+var open = require('open');
+
+module.exports = function (config) {
+  config.set({
+    singleRun: false,
+    autoWatch: true,
+    port: 5555,
+    browsers: [],
+    files: [ 'tests.webpack.js' ],
+    frameworks: [ 'jasmine' ],
+    preprocessors: {
+      'tests.webpack.js': ['webpack'],
+    },
+    reporters: [ 'progress' ],
+    webpack: require("./tools/webpack.config.base.js"),
+  });
+};
diff --git a/public/typings.json b/public/typings.json
new file mode 100644
index 000000000..a91a4eafe
--- /dev/null
+++ b/public/typings.json
@@ -0,0 +1,11 @@
+{
+  "globalDependencies": {
+    "es6-promise": "registry:dt/es6-promise#0.0.0+20160614011821",
+    "jasmine-ajax": "registry:dt/jasmine-ajax#3.1.1+20160802133254",
+    "node": "registry:env/node#6.0.0+20160723033700",
+    "react": "registry:dt/react#0.14.0+20160829191040"
+  },
+  "globalDevDependencies": {
+    "sinon": "registry:dt/sinon#1.16.0+20160517064723"
+  }
+}