diff --git a/gulpfile.js b/gulpfile.js
index 5c1ec16675..0bc7f50185 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,3 +1,4 @@
+require('babel/register');
 var gulp = require('gulp'),
   path = require('path'),
 
@@ -118,6 +119,7 @@ gulp.task('serve', function(cb) {
     script: paths.server,
     ext: '.js',
     ignore: paths.serverIgnore,
+    exec: './node_modules/.bin/babel-node',
     env: {
       'NODE_ENV': 'development',
       'DEBUG': process.env.DEBUG || 'freecc:*'
diff --git a/package.json b/package.json
index 1d6490d0f6..d1fa2d6526 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "npm": "2.3.0"
   },
   "scripts": {
-    "start": "node server/server.js",
+    "start": "babel-node server/server.js",
     "lint": "eslint --ext=.js,.jsx .",
     "test": "mocha",
     "postinstall": "bower cache clean && bower install && gulp build"
diff --git a/pm2Start.js b/pm2Start.js
index 6689e2d616..5742d6c232 100644
--- a/pm2Start.js
+++ b/pm2Start.js
@@ -1,3 +1,4 @@
+require('babel/register');
 var pm2 = require('pm2');
 pm2.connect(function() {
   pm2.start({
diff --git a/server/boot/a-react.js b/server/boot/a-react.js
index ac0f32ee09..ad9797e4d3 100644
--- a/server/boot/a-react.js
+++ b/server/boot/a-react.js
@@ -1,13 +1,13 @@
-// appFactory is an es6 module
-var debug = require('debug')('freecc:servereact');
-var app$ = require('../common/app/app-stream.jsx').default;
-var Cat = require('thundercats').Cat;
+import debugFactory from 'debug';
+import app$ from '../common/app/app-stream.jsx';
+import { Cat } from 'thundercats';
 
-var routes = [
+const debug = debugFactory('freecc:servereact');
+const routes = [
   '/jobs'
 ];
 
-module.exports = function(app) {
+export default function reactSubRouter(app) {
   var router = app.Router();
 
   routes.forEach(function(route) {
@@ -54,4 +54,4 @@ module.exports = function(app) {
         next
       );
   }
-};
+}