--- a/.hgignore	Fri Jan 22 20:33:26 2016 +0100
+++ b/.hgignore	Tue Jan 26 15:43:30 2016 +0100
@@ -2,4 +2,6 @@
 syntax: regexp
 ^node_modules$
 syntax: regexp
-^\.project$
\ No newline at end of file
+^\.project$
+syntax: regexp
+^jspm_packages$
\ No newline at end of file

--- a/app/boot.ts	Fri Jan 22 20:33:26 2016 +0100
+++ b/app/boot.ts	Tue Jan 26 15:43:30 2016 +0100
@@ -1,3 +1,6 @@
+import 'zone.js/dist/zone.min.js';
+import 'reflect-metadata';
+
 import {bootstrap}    from 'angular2/platform/browser'
 import {QueryAppComponent} from './query-app.component'
 

--- a/app/query.service.ts	Fri Jan 22 20:33:26 2016 +0100
+++ b/app/query.service.ts	Tue Jan 26 15:43:30 2016 +0100
@@ -2,6 +2,7 @@
 import {Http, Headers} from 'angular2/http';
 
 import 'rxjs/Rx'; // import all RxJS operators
+//import 'rxjs/add/operator/map';
 
 import {QueryMode, QUERY_MODES} from './query-mode';
 import {QueryState} from './query-state';

--- a/index.html	Fri Jan 22 20:33:26 2016 +0100
+++ b/index.html	Tue Jan 26 15:43:30 2016 +0100
@@ -4,23 +4,12 @@
     <title>ISMI Query Builder</title>
 
     <!-- 1. Load libraries -->
-    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
-    <script src="node_modules/systemjs/dist/system.src.js"></script>
-    <script src="node_modules/rxjs/bundles/Rx.js"></script>
-    <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
-    <script src="node_modules/angular2/bundles/http.dev.js"></script>
+    <script src="jspm_packages/system.js"></script>
+    <script src="config.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script>
-      System.config({
-        packages: {        
-          app: {
-            format: 'register',
-            defaultExtension: 'js'
-          }
-        }
-      });
-      System.import('app/boot')
+      System.import('app')
             .then(null, console.error.bind(console));
     </script>
 

--- a/package.json	Fri Jan 22 20:33:26 2016 +0100
+++ b/package.json	Tue Jan 26 15:43:30 2016 +0100
@@ -2,24 +2,26 @@
   "name": "ng2-ismi-query-app",
   "version": "1.0.0",
   "scripts": {
-    "tsc": "tsc",
-    "tsc:w": "tsc -w",
     "lite": "lite-server",
     "start": "concurrent \"npm run tsc:w\" \"npm run lite\" "
   },
-  "license": "ISC",
+  "jspm": {
+    "dependencies": {
+      "angular2": "npm:angular2@^2.0.0-beta.1",
+      "plugin-typescript": "github:frankwallis/plugin-typescript@^2.5.2",
+      "reflect-metadata": "npm:reflect-metadata@^0.1.3",
+      "rxjs": "npm:rxjs@5.0.0-beta.0",
+      "zone.js": "npm:zone.js@^0.5.10"
+    },
+    "devDependencies": {
+      "typescript": "npm:typescript@^1.6.2"
+    }
+  },
   "dependencies": {
-    "angular2": "2.0.0-beta.1",
-    "es6-promise": "^3.0.2",
-    "es6-shim": "^0.33.3",
-    "reflect-metadata": "^0.1.2",
-    "rxjs": "5.0.0-beta.0",
-    "systemjs": "0.19.14",
-    "zone.js": "0.5.10"
+    "lite-server": "^1.3.4"
   },
   "devDependencies": {
-    "concurrently": "^1.0.0",
-    "lite-server": "^1.3.1",
-    "typescript": "^1.7.3"
+    "angular2": "^2.0.0-beta.1",
+    "rxjs": "5.0.0-beta.0"
   }
 }

--- a/tsconfig.json	Fri Jan 22 20:33:26 2016 +0100
+++ b/tsconfig.json	Tue Jan 26 15:43:30 2016 +0100
@@ -2,14 +2,16 @@
   "compilerOptions": {
     "target": "ES5",
     "module": "system",
-    "moduleResolution": "node",
     "sourceMap": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "removeComments": false,
-    "noImplicitAny": false
+    "noImplicitAny": false,
+    "outDir": "build"
   },
   "exclude": [
-    "node_modules"
+    "jspm_packages",
+    "node_modules",
+    "dist"
   ]
-}
+}
\ No newline at end of file