diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b5cbae7..ce436cf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="669ca988-1ab2-486d-ab1c-9f96d1642854" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/spec/controllers/admin.coffee" afterPath="$PROJECT_DIR$/test/spec/controllers/admin.coffee" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/scripts/app.coffee" afterPath="$PROJECT_DIR$/app/scripts/app.coffee" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/spec/directives/cmsFormGroup.coffee" afterPath="$PROJECT_DIR$/test/spec/directives/cmsFormGroup.coffee" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/spec/services/cmsSessionService.coffee" afterPath="$PROJECT_DIR$/test/spec/services/cmsSessionService.coffee" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/spec/directives/cmswidget.coffee" afterPath="$PROJECT_DIR$/test/spec/directives/cmswidget.coffee" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/spec/directives/cmswidgets.coffee" afterPath="$PROJECT_DIR$/test/spec/directives/cmswidgets.coffee" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/karma.conf.js" afterPath="$PROJECT_DIR$/karma.conf.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/spec/controllers/login.coffee" afterPath="$PROJECT_DIR$/test/spec/controllers/login.coffee" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/spec/filters/markdown.coffee" afterPath="$PROJECT_DIR$/test/spec/filters/markdown.coffee" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/web.js" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/npm-debug.log" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="angular-cms-base.iws" />
@@ -34,17 +28,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="karma.conf.js" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/karma.conf.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="24" column="0" selection-start="927" selection-end="927" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1044">
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="login.coffee" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/spec/controllers/login.coffee">
           <provider selected="true" editor-type-id="text-editor">
@@ -108,19 +91,28 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="admin.coffee" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="admin.coffee" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/spec/controllers/admin.coffee">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="10" column="4" selection-start="208" selection-end="208" vertical-scroll-proportion="0.38251367" vertical-offset="0" max-vertical-offset="366">
+            <state line="13" column="64" selection-start="357" selection-end="357" vertical-scroll-proportion="-7.28" vertical-offset="0" max-vertical-offset="308">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="app.coffee" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/scripts/app.coffee">
+      <file leaf-file-name="server.js" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/server.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="103" column="1" selection-start="2715" selection-end="2715" vertical-scroll-proportion="0.32" vertical-offset="1450" max-vertical-offset="1526">
+            <state line="71" column="16" selection-start="1432" selection-end="1432" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2226">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="web.js" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/web.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="2" column="28" selection-start="66" selection-end="72" vertical-scroll-proportion="0.07106599" vertical-offset="0" max-vertical-offset="394">
               <folding />
             </state>
           </provider>
@@ -168,6 +160,7 @@
         <option value="$PROJECT_DIR$/test/spec/services/cmsSessionService.coffee" />
         <option value="$PROJECT_DIR$/test/spec/filters/markdown.coffee" />
         <option value="$PROJECT_DIR$/test/spec/controllers/admin.coffee" />
+        <option value="$PROJECT_DIR$/web.js" />
       </list>
     </option>
   </component>
@@ -416,6 +409,16 @@
     </option>
   </component>
   <component name="RunManager" selected="Karma.Unit Tests">
+    <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
+      <option name="VMOptions" />
+      <option name="arguments" />
+      <option name="filePath" />
+      <option name="name" value="Dart" />
+      <option name="saveOutputToFile" value="false" />
+      <option name="showConsoleOnStdErr" value="false" />
+      <option name="showConsoleOnStdOut" value="false" />
+      <method />
+    </configuration>
     <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
       <option name="VMOptions" />
       <option name="arguments" />
@@ -435,6 +438,9 @@
       <setting name="preferredDebugBrowser" value="CHROME" />
       <method />
     </configuration>
+    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true">
+      <method />
+    </configuration>
     <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" working-dir="">
       <browser start="false" url="" with-js-debugger="false" />
       <method />
@@ -520,8 +526,8 @@
     <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1389728" sideWeight="0.49674797" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15407854" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Heroku" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.4997015" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3530303" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Heroku" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32575756" sideWeight="0.4997015" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="RemoteSynchronizer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Mongo Runner" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@@ -533,7 +539,7 @@
       <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13930348" sideWeight="0.86018234" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Mongo Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15588723" sideWeight="0.86018234" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33030304" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33030304" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293944" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
@@ -583,11 +589,6 @@
         <state line="519" column="15" selection-start="12731" selection-end="12731" vertical-scroll-proportion="0.4074844" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="71" column="16" selection-start="1432" selection-end="1432" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/admin.html">
       <provider selected="true" editor-type-id="text-editor">
         <state line="30" column="26" selection-start="1716" selection-end="1716" vertical-scroll-proportion="0.25055927" vertical-offset="0" max-vertical-offset="0" />
@@ -622,7 +623,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/scripts/app.coffee">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="103" column="1" selection-start="2715" selection-end="2715" vertical-scroll-proportion="0.32" vertical-offset="1450" max-vertical-offset="1526">
+        <state line="103" column="1" selection-start="2705" selection-end="2705" vertical-scroll-proportion="0.32" vertical-offset="1450" max-vertical-offset="1526">
           <folding />
         </state>
       </provider>
@@ -687,7 +688,21 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/spec/controllers/admin.coffee">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="4" selection-start="208" selection-end="208" vertical-scroll-proportion="0.38251367" vertical-offset="0" max-vertical-offset="366">
+        <state line="13" column="64" selection-start="357" selection-end="357" vertical-scroll-proportion="-7.28" vertical-offset="0" max-vertical-offset="308">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="71" column="16" selection-start="1432" selection-end="1432" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2226">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="2" column="28" selection-start="66" selection-end="72" vertical-scroll-proportion="0.07106599" vertical-offset="0" max-vertical-offset="394">
           <folding />
         </state>
       </provider>
diff --git a/Procfile b/Procfile
index 6f86b16..d1913eb 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: node server.js
\ No newline at end of file
+web: node web.js
\ No newline at end of file
diff --git a/npm-debug.log b/npm-debug.log
deleted file mode 100644
index 7168338..0000000
--- a/npm-debug.log
+++ /dev/null
@@ -1,21 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'node', '/usr/local/bin/npm', 'update', 'yo', '-g' ]
-2 info using npm@1.3.15
-3 info using node@v0.10.22
-4 info outdated updating undefined
-5 error Failed to parse json
-5 error Unexpected token <
-6 error File: /usr/local/lib/node_modules/generator-angular-cms/package.json
-7 error Failed to parse package.json data.
-7 error package.json must be actual JSON, not just JavaScript.
-7 error
-7 error This is not a bug in npm.
-7 error Tell the package author to fix their package.json file. JSON.parse
-8 error System Darwin 13.0.0
-9 error command "node" "/usr/local/bin/npm" "update" "yo" "-g"
-10 error cwd /WWW/Learning_Yeoman/angular-cms
-11 error node -v v0.10.22
-12 error npm -v 1.3.15
-13 error file /usr/local/lib/node_modules/generator-angular-cms/package.json
-14 error code EJSONPARSE
-15 verbose exit [ 1, true ]
diff --git a/package.json b/package.json
index 933c6a9..da9c701 100755
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
     "mongodb": "~1.3.19",
     "express": "~3.4.6",
     "connect": "~2.11.2",
-    "request": "https://registry.npmjs.org/request/-/request-2.0.5.tgz"
+    "request": "https://registry.npmjs.org/request/-/request-2.0.5.tgz",
+    "logfmt": "~0.18.1"
   },
   "devDependencies": {
     "grunt": "~0.4.2",
diff --git a/web.js b/web.js
new file mode 100644
index 0000000..a077a70
--- /dev/null
+++ b/web.js
@@ -0,0 +1,16 @@
+// web.js
+var express = require("express");
+var logfmt = require("logfmt");
+var app = express();
+
+app.use(logfmt.requestLogger());
+app.use(express.static(__dirname + '/dist'));
+app.use('/', express.directory('/dist'));
+app.get('/', function(req, res) {
+
+});
+
+var port = process.env.PORT || 5000;
+app.listen(port, function() {
+    console.log("Listening on " + port);
+});
\ No newline at end of file