diff --git a/app/config.js b/app/config.js
index 6acfcad..40bb4f9 100644
--- a/app/config.js
+++ b/app/config.js
@@ -3,6 +3,6 @@ export default {
   firebaseUrl : "https://shitjoonsays.firebaseio.com/tests/quotes/"
 }
 
-//export default {
+// export default {
 //  firebaseUrl : "https://shitjoonsays.firebaseio.com/quotes/"
-//}
\ No newline at end of file
+// }
\ No newline at end of file
diff --git a/app/views/main.js b/app/views/main.js
index 7e6391e..4081d3e 100644
--- a/app/views/main.js
+++ b/app/views/main.js
@@ -45,9 +45,14 @@ export default class Main extends React.Component {
           </form>
         </div>
         <div className="container" style={style.container}>
-          {comments.map((comment, key) => (
-            <CommentBox comment={comment} id={key} key={key}/>
-          )).toArray()}
+          {comments
+            .sort((a, b) => {
+              let aTime = new Date(a.get("timestamp"));
+              let bTime = new Date(b.get("timestamp"));
+              return bTime.getTime() - aTime.getTime();
+            }).map((comment, key) => (
+              <CommentBox comment={comment} id={key} key={key}/>
+            )).toArray()}
         </div>
       </div>
     )
diff --git a/config.js b/config.js
index 38921b3..dea84b8 100644
--- a/config.js
+++ b/config.js
@@ -28,6 +28,7 @@ System.config({
     "react-pure-render": "npm:react-pure-render@1.0.2",
     "redux": "npm:redux@3.0.4",
     "redux-thunk": "npm:redux-thunk@1.0.0",
+    "systemjs": "npm:systemjs@0.19.22",
     "github:jspm/nodelibs-assert@0.1.0": {
       "assert": "npm:assert@1.3.0"
     },
@@ -70,6 +71,9 @@ System.config({
     "github:jspm/nodelibs-path@0.1.0": {
       "path-browserify": "npm:path-browserify@0.0.0"
     },
+    "github:jspm/nodelibs-process@0.1.1": {
+      "process": "npm:process@0.10.1"
+    },
     "github:jspm/nodelibs-process@0.1.2": {
       "process": "npm:process@0.11.2"
     },
@@ -256,6 +260,13 @@ System.config({
       "process": "github:jspm/nodelibs-process@0.1.2",
       "through": "npm:through@2.3.8"
     },
+    "npm:es6-module-loader@0.17.11": {
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0",
+      "util": "github:jspm/nodelibs-util@0.1.0",
+      "when": "npm:when@3.7.7"
+    },
     "npm:esprima-fb@13001.1001.0-dev-harmony-fb": {
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "process": "github:jspm/nodelibs-process@0.1.2"
@@ -448,6 +459,13 @@ System.config({
     "npm:string_decoder@0.10.31": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0"
     },
+    "npm:systemjs@0.19.22": {
+      "es6-module-loader": "npm:es6-module-loader@0.17.11",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0",
+      "when": "npm:when@3.7.7"
+    },
     "npm:through@2.3.8": {
       "process": "github:jspm/nodelibs-process@0.1.2",
       "stream": "github:jspm/nodelibs-stream@0.1.0"
@@ -492,6 +510,9 @@ System.config({
       "websocket-extensions": "npm:websocket-extensions@0.1.1"
     },
     "npm:websocket-extensions@0.1.1": {
+      "process": "github:jspm/nodelibs-process@0.1.1"
+    },
+    "npm:when@3.7.7": {
       "process": "github:jspm/nodelibs-process@0.1.2"
     }
   }
diff --git a/package.json b/package.json
index 2f5b35d..bc5f6fd 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,8 @@
       "react-dom": "npm:react-dom@^0.14.0",
       "react-pure-render": "npm:react-pure-render@^1.0.2",
       "redux": "npm:redux@^3.0.4",
-      "redux-thunk": "npm:redux-thunk@^1.0.0"
+      "redux-thunk": "npm:redux-thunk@^1.0.0",
+      "systemjs": "npm:systemjs@^0.19.22"
     },
     "devDependencies": {
       "babel": "npm:babel-core@^5.8.24",