diff --git a/config.js b/config.js
index 7bd8aa3..85d708c 100644
--- a/config.js
+++ b/config.js
@@ -1,5 +1,6 @@
 System.config({
   "baseURL": "/",
+  "defaultJSExtensions": true,
   "transpiler": "babel",
   "babelOptions": {
     "optional": [
@@ -7,31 +8,23 @@ System.config({
     ]
   },
   "paths": {
-    "*": "*.js",
-    "github:*": "jspm_packages/github/*.js",
-    "npm:*": "jspm_packages/npm/*.js"
+    "github:*": "jspm_packages/github/*",
+    "npm:*": "jspm_packages/npm/*"
   }
 });
 
 System.config({
   "map": {
-    "config-API": "src/configapi", 
-    "doodle3d-API": "src/doodle3dapi", 
-    "info-API": "src/infoapi", 
-    "network-API": "src/networkapi", 
-    "printer-API": "src/printerapi", 
-    "rest-API": "src/restapi", 
-    "sketch-API": "src/sketchapi", 
-    "system-API": "src/systemapi", 
-    "update-API": "src/updateapi", 
-    "babel": "npm:babel-core@5.6.20",
-    "babel-runtime": "npm:babel-runtime@5.6.20",
+    "babel": "npm:babel-core@5.7.4",
+    "babel-runtime": "npm:babel-runtime@5.7.0",
     "core-js": "npm:core-js@0.9.18",
     "jquery": "github:components/jquery@2.1.4",
+    "traceur": "github:jmcriffey/bower-traceur@0.0.90",
+    "traceur-runtime": "github:jmcriffey/bower-traceur-runtime@0.0.90",
     "github:jspm/nodelibs-process@0.1.1": {
       "process": "npm:process@0.10.1"
     },
-    "npm:babel-runtime@5.6.20": {
+    "npm:babel-runtime@5.7.0": {
       "process": "github:jspm/nodelibs-process@0.1.1"
     },
     "npm:core-js@0.9.18": {
diff --git a/example/app.js b/example/app.js
index 53167c1..b477ee7 100644
--- a/example/app.js
+++ b/example/app.js
@@ -1,73 +1,83 @@
-import Doodle3DAPI from 'doodle3d-API';
-import rest from 'rest-API';
+import Doodle3DAPI from 'src/doodle3dapi.js';
+import rest from 'src/restapi.js';
 
 var api = 'http://connect.doodle3d.com/api/';
-var known = [];
 
-function addBox (boxData) {
+var addBox = (function () {
+	var known = [];
 
-	if (known.indexOf(boxData.localip) === -1) {
-		known.push(boxData.localip);
+	return function (boxData) {
+		if (known.indexOf(boxData.localip) === -1) {
+			known.push(boxData.localip);
 
-		var row = document.createElement('tr');
-		row.style.color = 'gray';
-
-		var id = document.createElement('td');
-		var state = document.createElement('td');
-		var localIP = document.createElement('td');
-		var bed = document.createElement('td');
-		var bedTarget = document.createElement('td');
-		var bufferedLines = document.createElement('td');
-		var currentLine = document.createElement('td');
-		var hasControl = document.createElement('td');
-		var hotend = document.createElement('td');
-		var hotendTarget = document.createElement('td');
-		var totalLines = document.createElement('td');
-
-		row.appendChild(id);
-		row.appendChild(localIP);
-		row.appendChild(state);
-		row.appendChild(currentLine);
-		row.appendChild(bufferedLines);
-		row.appendChild(totalLines);
-		row.appendChild(hotend);
-		row.appendChild(hotendTarget);
-		row.appendChild(bed);
-		row.appendChild(bedTarget);
-		row.appendChild(hasControl);
-
-		id.innerHTML = boxData.wifiboxid;
-		localIP.innerHTML = boxData.localip;
-
-		document.getElementById('table').appendChild(row);
-
-		var doodle3DAPI = new Doodle3DAPI(boxData.localip);
-		doodle3DAPI.onconnect = function () {
-			row.style.color = 'black';
-		};
-		doodle3DAPI.ondisconnect = function () {
+			var row = document.createElement('tr');
 			row.style.color = 'gray';
-		};
-		doodle3DAPI.onupdate = function (data) {
-			console.log(data);
-			state.innerHTML = data.state;
-			if (data.state !== 'disconnected' && data.state !== 'connecting' && data.state !== 'unknown') {
-				bed.innerHTML = data.bed;
-				bedTarget.innerHTML = data.bed_target;
-				bufferedLines.innerHTML = data.buffered_lines;
-				currentLine.innerHTML = data.current_line;
-				hasControl.innerHTML = data.has_control;
-				hotend.innerHTML = data.hotend;
-				hotendTarget.innerHTML = data.hotend_target;
+
+			var id = document.createElement('td');
+			var state = document.createElement('td');
+			var localIP = document.createElement('td');
+			var bed = document.createElement('td');
+			var bedTarget = document.createElement('td');
+			var bufferedLines = document.createElement('td');
+			var currentLine = document.createElement('td');
+			var hasControl = document.createElement('td');
+			var hotend = document.createElement('td');
+			var hotendTarget = document.createElement('td');
+			var totalLines = document.createElement('td');
+
+			row.appendChild(id);
+			row.appendChild(localIP);
+			row.appendChild(state);
+			row.appendChild(currentLine);
+			row.appendChild(bufferedLines);
+			row.appendChild(totalLines);
+			row.appendChild(hotend);
+			row.appendChild(hotendTarget);
+			row.appendChild(bed);
+			row.appendChild(bedTarget);
+			row.appendChild(hasControl);
+
+			id.innerHTML = boxData.wifiboxid;
+			localIP.innerHTML = boxData.localip;
+
+			document.getElementById('table').appendChild(row);
+
+			var doodle3DAPI = new Doodle3DAPI(boxData.localip);
+			doodle3DAPI.onconnect = function () {
+				row.style.color = 'black';
+			};
+			doodle3DAPI.ondisconnect = function () {
+				row.style.color = 'gray';
+			};
+			doodle3DAPI.onupdate = function (data) {
 				state.innerHTML = data.state;
-				totalLines.innerHTML = data.total_lines;
-			}
-			else {
-			}
-		};
-		doodle3DAPI.startUpdateLoop();
+				if (data.state !== 'disconnected' && data.state !== 'connecting' && data.state !== 'unknown') {
+					bed.innerHTML = data.bed;
+					bedTarget.innerHTML = data.bed_target;
+					bufferedLines.innerHTML = data.buffered_lines;
+					currentLine.innerHTML = data.current_line;
+					hasControl.innerHTML = data.has_control;
+					hotend.innerHTML = data.hotend;
+					hotendTarget.innerHTML = data.hotend_target;
+					state.innerHTML = data.state;
+					totalLines.innerHTML = data.total_lines;
+				}
+				else {
+					bed.innerHTML = '';
+					bedTarget.innerHTML = '';
+					bufferedLines.innerHTML = '';
+					currentLine.innerHTML = '';
+					hasControl.innerHTML = '';
+					hotend.innerHTML = '';
+					hotendTarget.innerHTML = '';
+					state.innerHTML = '';
+					totalLines.innerHTML = '';
+				}
+			};
+			doodle3DAPI.startUpdateLoop();
+		}
 	}
-}
+})();
 
 function searchBoxes () {
 	rest.get(api + 'list.php', function (error, boxes) {
@@ -83,12 +93,11 @@ function searchBoxes () {
 		}
 	});
 }
-
 setInterval(searchBoxes, 5000);
 searchBoxes();
 
 addBox({
-	localip: window.location.host + ':3000', 
+	localip: '127.0.0.1:3000', 
 	wifiboxid: 'Node Server'
 });
 
diff --git a/example/index.html b/example/index.html
index 742b390..bedade4 100644
--- a/example/index.html
+++ b/example/index.html
@@ -17,7 +17,7 @@
 	<script type="text/javascript" src="../config.js"></script>
 
 	<script type="text/javascript">
-		System.import('example/app');
+		System.import('example/app.js');
 	</script>
 
 </head>
diff --git a/package.json b/package.json
index 267e411..15d198f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
 {
   "jspm": {
-    "format": "es6",
-    "main": "doodle3dapi.js",
+    "main": "./doodle3dapi",
     "directories": {
       "lib": "src"
     },
@@ -11,17 +10,9 @@
     "devDependencies": {
       "babel": "npm:babel-core@^5.1.13",
       "babel-runtime": "npm:babel-runtime@^5.1.13",
-      "core-js": "npm:core-js@^0.9.4"
-    }, 
-    "map": {
-      "config-API": "src/configapi", 
-      "info-API": "src/infoapi", 
-      "network-API": "src/networkapi", 
-      "printer-API": "src/printerapi", 
-      "rest-API": "src/restapi", 
-      "sketch-API": "src/sketchapi", 
-      "system-API": "src/systemapi", 
-      "update-API": "src/updateapi"
+      "core-js": "npm:core-js@^0.9.4",
+      "traceur": "github:jmcriffey/bower-traceur@0.0.90",
+      "traceur-runtime": "github:jmcriffey/bower-traceur-runtime@0.0.90"
     }
   }
 }
diff --git a/src/configapi.js b/src/configapi.js
index aa04414..9f60b7c 100644
--- a/src/configapi.js
+++ b/src/configapi.js
@@ -1,4 +1,4 @@
-import rest from 'rest-API';
+import rest from './restapi.js';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/doodle3dapi.js b/src/doodle3dapi.js
index ea9b43c..1d95343 100644
--- a/src/doodle3dapi.js
+++ b/src/doodle3dapi.js
@@ -1,11 +1,11 @@
-import rest from 'rest-API';
-import ConfigAPI from 'config-API';
-import InfoAPI from 'info-API';
-import NetworkAPI from 'network-API';
-import PrinterAPI from 'printer-API';
-import SketchAPI from 'sketch-API';
-import SystemAPI from 'system-API';
-import UpdateAPI from 'update-API';
+import rest from './restapi.js';
+import ConfigAPI from './configapi.js';
+import InfoAPI from './infoapi.js';
+import NetworkAPI from './networkapi.js';
+import PrinterAPI from './printerapi.js';
+import SketchAPI from './sketchapi.js';
+import SystemAPI from './systemapi.js';
+import UpdateAPI from './updateapi.js';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/infoapi.js b/src/infoapi.js
index 011413c..fa28e89 100644
--- a/src/infoapi.js
+++ b/src/infoapi.js
@@ -1,4 +1,4 @@
-import rest from 'rest-API';
+import rest from './restapi.js';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/networkapi.js b/src/networkapi.js
index dbb8e94..5859e31 100644
--- a/src/networkapi.js
+++ b/src/networkapi.js
@@ -1,4 +1,4 @@
-import rest from 'rest-API';
+import rest from './restapi.js';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/printerapi.js b/src/printerapi.js
index 1455634..2e96ac5 100644
--- a/src/printerapi.js
+++ b/src/printerapi.js
@@ -1,4 +1,4 @@
-import rest from 'rest-API';
+import rest from './restapi.js';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/restapi.js b/src/restapi.js
index 6e0f2de..6820b92 100644
--- a/src/restapi.js
+++ b/src/restapi.js
@@ -43,4 +43,4 @@ export default {
 			callback('Failed connecting to ' + url);
 		});	
 	}
-};
\ No newline at end of file
+};
diff --git a/src/sketchapi.js b/src/sketchapi.js
index c60a087..49d4c0a 100644
--- a/src/sketchapi.js
+++ b/src/sketchapi.js
@@ -1,4 +1,4 @@
-import rest from 'rest-API';
+import rest from './restapi.js';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/systemapi.js b/src/systemapi.js
index 98b22d1..4e65758 100644
--- a/src/systemapi.js
+++ b/src/systemapi.js
@@ -1,4 +1,4 @@
-import rest from 'rest-API';
+import rest from './restapi.js';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/updateapi.js b/src/updateapi.js
index 8aa9abf..d769bf9 100644
--- a/src/updateapi.js
+++ b/src/updateapi.js
@@ -1,4 +1,4 @@
-import rest from 'rest-API';
+import rest from './restapi.js';
 
 export default class {
 	constructor (localIP) {