diff --git a/js/app.js b/js/app.js
index 311a04e..58b25b2 100755
--- a/js/app.js
+++ b/js/app.js
@@ -1,12 +1,12 @@
-'use strict';
-require('todomvc-common/base.css');
-require('todomvc-app-css/index.css');
-var View = require('./view');
-var helpers = require('./helpers');
-var Controller = require('./controller');
-var Model = require('./model');
-var Store = require('./store');
-var Template = require('./template');
+import 'todomvc-common/base.css';
+import 'todomvc-app-css/index.css';
+
+import View from './view';
+import helpers from './helpers';
+import Controller from './controller';
+import Model from './model';
+import Store from './store';
+import Template from './template';
 
 var $on = helpers.$on;
 /**
diff --git a/js/controller.js b/js/controller.js
index 4f5e9a7..3d5c174 100755
--- a/js/controller.js
+++ b/js/controller.js
@@ -1,5 +1,4 @@
-'use strict';
-module.exports = Controller;
+export default Controller;
 /**
  * Takes a model and view and acts as the controller between them
  *
diff --git a/js/helpers.js b/js/helpers.js
index 48b3fa2..d9ff260 100755
--- a/js/helpers.js
+++ b/js/helpers.js
@@ -1,12 +1,5 @@
 /*global NodeList */
-'use strict';
-module.exports = {
-	qs: qs,
-	qsa: qsa,
-	$on: $on,
-	$delegate: $delegate,
-	$parent: $parent
-};
+export default {qs, qsa, $on, $delegate, $parent};
 
 // Get element(s) by CSS selector:
 function qs(selector, scope) {
diff --git a/js/model.js b/js/model.js
index d6049ca..241cbf8 100755
--- a/js/model.js
+++ b/js/model.js
@@ -1,5 +1,5 @@
-'use strict';
-module.exports = Model;
+export default Model;
+
 /**
  * Creates a new Model instance and hooks up the storage.
  *
diff --git a/js/store.js b/js/store.js
index 5ef1eaf..e661b83 100755
--- a/js/store.js
+++ b/js/store.js
@@ -1,6 +1,5 @@
 /*jshint eqeqeq:false */
-'use strict';
-module.exports = Store;
+export default Store;
 /**
  * Creates a new client side storage object and will create an empty
  * collection if no collection already exists.
diff --git a/js/template.js b/js/template.js
index b6d1ca7..a7a4f82 100755
--- a/js/template.js
+++ b/js/template.js
@@ -1,7 +1,5 @@
 /*jshint laxbreak:true */
-'use strict';
-
-module.exports = Template;
+export default Template;
 
 var htmlEscapes = {
 	'&': '&',
diff --git a/js/view.js b/js/view.js
index 0ce9ac5..bfd9dfd 100755
--- a/js/view.js
+++ b/js/view.js
@@ -1,12 +1,6 @@
-'use strict';
-var helpers = require('./helpers');
-var qs = helpers.qs;
-var qsa = helpers.qsa;
-var $on = helpers.$on;
-var $parent = helpers.$parent;
-var $delegate = helpers.$delegate;
+import {qs, qsa, $on, $parent, $delegate} from './helpers';
 
-module.exports = View;
+export default View;
 /**
  * View that abstracts away the browser's DOM completely.
  * It has two simple entry points:
diff --git a/karma.conf.js b/karma.conf.js
index 818bf8e..61a8c5e 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -58,7 +58,7 @@ module.exports = function (config) {
 
 		// start these browsers
 		// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-		browsers: ['Chrome'],
+		browsers: ['Firefox'],
 
 
 		// Continuous Integration mode
@@ -68,6 +68,7 @@ module.exports = function (config) {
 		plugins: [
 			require('karma-webpack'),
 			'karma-jasmine',
+			'karma-firefox-launcher',
 			'karma-chrome-launcher'
 		]
 	});
diff --git a/package.json b/package.json
index ec4c02b..4cc85c5 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "jasmine-core": "2.3.4",
     "karma": "0.13.8",
     "karma-chrome-launcher": "0.2.0",
+    "karma-firefox-launcher": "0.1.6",
     "karma-jasmine": "0.3.6",
     "karma-webpack": "1.7.0",
     "style-loader": "0.12.3",
diff --git a/test/ControllerSpec.js b/test/ControllerSpec.js
index fb654e6..8eccfe4 100755
--- a/test/ControllerSpec.js
+++ b/test/ControllerSpec.js
@@ -1,9 +1,7 @@
 /*global app, jasmine, describe, it, beforeEach, expect */
-var Controller = require('../js/controller');
+import Controller from '../js/controller';
 
 describe('controller', function () {
-	'use strict';
-
 	var subject, model, view;
 
 	var setUpModel = function (todos) {
diff --git a/webpack.config.js b/webpack.config.js
index baf53ee..9bd08eb 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,6 +9,7 @@ var config = {
 	context: here('js'),
 	module: {
 		loaders: [
+			{test: /\.js$/, loader: 'babel', exclude: /node_modules/},
 			{test: /\.css$/, loader: 'style!css'}
 		]
 	}