diff --git a/client/config.js b/client/config.js
index 8fcebd8..9d1b4f3 100644
--- a/client/config.js
+++ b/client/config.js
@@ -201,20 +201,10 @@ System.config({
     }
   },
   bundles: {
-    "app-build-d5c126cdef.js": [
-      "SnapshotsDB.js",
-      "add-snapshot-form.html!github:systemjs/plugin-text@0.0.3.js",
-      "add-snapshot-form.js",
+    "app-build-cd89144a80.js": [
       "app.html!github:systemjs/plugin-text@0.0.3.js",
       "app.js",
-      "date-format.js",
-      "index.html!github:systemjs/plugin-text@0.0.3.js",
-      "index.js",
-      "main.js",
-      "snapshot.html!github:systemjs/plugin-text@0.0.3.js",
-      "snapshot.js",
-      "snapshots-list.html!github:systemjs/plugin-text@0.0.3.js",
-      "snapshots-list.js"
+      "main.js"
     ],
     "aurelia-b23cdcaf13.js": [
       "github:jspm/nodelibs-process@0.1.2.js",
@@ -305,25 +295,5 @@ System.config({
       "npm:process@0.11.2/browser.js"
     ]
   },
-  depCache: {
-    "add-snapshot-form.js": [
-      "npm:aurelia-framework@1.0.0-beta.1.1.3.js",
-      "SnapshotsDB.js"
-    ],
-    "date-format.js": [
-      "npm:moment@2.11.2.js"
-    ],
-    "snapshot.js": [
-      "npm:aurelia-framework@1.0.0-beta.1.1.3.js",
-      "SnapshotsDB.js"
-    ],
-    "snapshots-list.js": [
-      "npm:aurelia-framework@1.0.0-beta.1.1.3.js",
-      "SnapshotsDB.js"
-    ],
-    "SnapshotsDB.js": [
-      "npm:aurelia-framework@1.0.0-beta.1.1.3.js",
-      "npm:aurelia-fetch-client@1.0.0-beta.1.1.0.js"
-    ]
-  }
+  depCache: {}
 });
\ No newline at end of file
diff --git a/client/dist/SnapshotsDB.js b/client/dist/SnapshotsDB.js
deleted file mode 100644
index 3e0535f..0000000
--- a/client/dist/SnapshotsDB.js
+++ /dev/null
@@ -1,95 +0,0 @@
-System.register(['aurelia-framework', 'aurelia-fetch-client'], function (_export) {
-	'use strict';
-
-	var inject, HttpClient, SnapshotsDB;
-
-	var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
-
-	return {
-		setters: [function (_aureliaFramework) {
-			inject = _aureliaFramework.inject;
-		}, function (_aureliaFetchClient) {
-			HttpClient = _aureliaFetchClient.HttpClient;
-		}],
-		execute: function () {
-			SnapshotsDB = (function () {
-				function SnapshotsDB(http) {
-					var _this = this;
-
-					_classCallCheck(this, _SnapshotsDB);
-
-					this.snapshots = [];
-
-					http.configure(function (config) {
-						config.useStandardConfiguration();
-					});
-
-					this.http = http;
-
-					this.http.fetch('snapshots').then(function (response) {
-						return response.json();
-					}).then(function (snapshots) {
-						snapshots.forEach(function (snapshot) {
-							_this.snapshots.push(snapshot);
-						});
-					});
-				}
-
-				_createClass(SnapshotsDB, [{
-					key: 'getAll',
-					value: function getAll() {
-						return this.snapshots;
-					}
-				}, {
-					key: 'add',
-					value: function add(url) {
-						var _this2 = this;
-
-						var myHeaders = new Headers();
-						myHeaders.append('Content-Type', 'application/json');
-						return this.http.fetch('snapshot', {
-							method: 'post',
-							headers: myHeaders,
-							body: JSON.stringify({
-								url: url
-							})
-						}).then(function (response) {
-							return response.json();
-						}).then(function (snapshot) {
-							_this2.snapshots.push(snapshot);
-						});
-					}
-				}, {
-					key: 'remove',
-					value: function remove(snapshot) {
-						var _this3 = this;
-
-						this.http.fetch('snapshot/' + snapshot._id, {
-							method: 'DELETE'
-						}).then(function (response) {
-							_this3.snapshots.splice(_this3.snapshots.indexOf(snapshot), 1);
-						});
-					}
-				}, {
-					key: 'get',
-					value: function get(id) {
-						return this.http.fetch('snapshot/' + id, {
-							method: 'GET'
-						}).then(function (response) {
-							return response.json();
-						});
-					}
-				}]);
-
-				var _SnapshotsDB = SnapshotsDB;
-				SnapshotsDB = inject(HttpClient)(SnapshotsDB) || SnapshotsDB;
-				return SnapshotsDB;
-			})();
-
-			_export('SnapshotsDB', SnapshotsDB);
-		}
-	};
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNuYXBzaG90c0RCLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozt5QkFJYSxXQUFXOzs7Ozs7Ozs4QkFKaEIsTUFBTTs7b0NBQ04sVUFBVTs7O0FBR0wsY0FBVztBQUdaLGFBSEMsV0FBVyxDQUdYLElBQUksRUFBQzs7Ozs7VUFGakIsU0FBUyxHQUFHLEVBQUU7O0FBR2IsU0FBSSxDQUFDLFNBQVMsQ0FBQyxVQUFBLE1BQU0sRUFBSTtBQUN4QixZQUFNLENBQ0osd0JBQXdCLEVBQUUsQ0FBQztNQUM3QixDQUFDLENBQUM7O0FBRUgsU0FBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7O0FBRWpCLFNBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUMzQixJQUFJLENBQUMsVUFBQSxRQUFRO2FBQUksUUFBUSxDQUFDLElBQUksRUFBRTtNQUFBLENBQUMsQ0FDakMsSUFBSSxDQUFDLFVBQUEsU0FBUyxFQUFJO0FBQ2xCLGVBQVMsQ0FBQyxPQUFPLENBQUMsVUFBQSxRQUFRLEVBQUk7QUFDN0IsYUFBSyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO09BQzlCLENBQUMsQ0FBQztNQUNILENBQUMsQ0FBQztLQUNIOztpQkFsQlcsV0FBVzs7WUFtQmpCLGtCQUFFO0FBQ1AsYUFBTyxJQUFJLENBQUMsU0FBUyxDQUFDO01BQ3RCOzs7WUFDRSxhQUFDLEdBQUcsRUFBQzs7O0FBQ1AsVUFBSSxTQUFTLEdBQUcsSUFBSSxPQUFPLEVBQUUsQ0FBQztBQUM5QixlQUFTLENBQUMsTUFBTSxDQUFDLGNBQWMsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO0FBQ3JELGFBQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsVUFBVSxFQUFFO0FBQ2xDLGFBQU0sRUFBRSxNQUFNO0FBQ2QsY0FBTyxFQUFFLFNBQVM7QUFDbEIsV0FBSSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUM7QUFDcEIsV0FBRyxFQUFFLEdBQUc7UUFDUixDQUFDO09BQ0YsQ0FBQyxDQUNELElBQUksQ0FBQyxVQUFBLFFBQVE7Y0FBSSxRQUFRLENBQUMsSUFBSSxFQUFFO09BQUEsQ0FBQyxDQUNqQyxJQUFJLENBQUMsVUFBQSxRQUFRLEVBQUk7QUFDakIsY0FBSyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO09BQzlCLENBQUMsQ0FBQztNQUNIOzs7WUFDSyxnQkFBQyxRQUFRLEVBQUM7OztBQUNmLFVBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsR0FBRyxRQUFRLENBQUMsR0FBRyxFQUFFO0FBQzNDLGFBQU0sRUFBRSxRQUFRO09BQ2hCLENBQUMsQ0FDRCxJQUFJLENBQUMsVUFBQSxRQUFRLEVBQUk7QUFDakIsY0FBSyxTQUFTLENBQUMsTUFBTSxDQUFDLE9BQUssU0FBUyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztPQUMzRCxDQUFDLENBQUM7TUFDSDs7O1lBQ0UsYUFBQyxFQUFFLEVBQUM7QUFDTixhQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsR0FBRyxFQUFFLEVBQUU7QUFDeEMsYUFBTSxFQUFFLEtBQUs7T0FDYixDQUFDLENBQ0QsSUFBSSxDQUFDLFVBQUEsUUFBUTtjQUFJLFFBQVEsQ0FBQyxJQUFJLEVBQUU7T0FBQSxDQUFDLENBQUM7TUFDbkM7Ozt1QkFsRFcsV0FBVztBQUFYLGVBQVcsR0FEdkIsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUNOLFdBQVcsS0FBWCxXQUFXO1dBQVgsV0FBVyIsImZpbGUiOiJTbmFwc2hvdHNEQi5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7aW5qZWN0fSBmcm9tICdhdXJlbGlhLWZyYW1ld29yayc7XHJcbmltcG9ydCB7SHR0cENsaWVudH0gZnJvbSAnYXVyZWxpYS1mZXRjaC1jbGllbnQnO1xyXG5cclxuQGluamVjdChIdHRwQ2xpZW50KVxyXG5leHBvcnQgY2xhc3MgU25hcHNob3RzREJ7XHJcblx0c25hcHNob3RzID0gW107XHJcblxyXG5cdGNvbnN0cnVjdG9yKGh0dHApe1xyXG5cdFx0aHR0cC5jb25maWd1cmUoY29uZmlnID0+IHtcclxuXHRcdFx0Y29uZmlnXHJcblx0XHRcdFx0LnVzZVN0YW5kYXJkQ29uZmlndXJhdGlvbigpO1xyXG5cdFx0fSk7XHJcblx0XHRcclxuXHRcdHRoaXMuaHR0cCA9IGh0dHA7XHJcblx0XHRcclxuXHRcdHRoaXMuaHR0cC5mZXRjaCgnc25hcHNob3RzJylcclxuXHRcdC50aGVuKHJlc3BvbnNlID0+IHJlc3BvbnNlLmpzb24oKSlcclxuXHRcdC50aGVuKHNuYXBzaG90cyA9PiB7XHJcblx0XHRcdHNuYXBzaG90cy5mb3JFYWNoKHNuYXBzaG90ID0+IHtcclxuXHRcdFx0XHR0aGlzLnNuYXBzaG90cy5wdXNoKHNuYXBzaG90KTtcclxuXHRcdFx0fSk7XHJcblx0XHR9KTtcclxuXHR9XHJcblx0Z2V0QWxsKCl7XHJcblx0XHRyZXR1cm4gdGhpcy5zbmFwc2hvdHM7XHJcblx0fVxyXG5cdGFkZCh1cmwpe1xyXG5cdFx0dmFyIG15SGVhZGVycyA9IG5ldyBIZWFkZXJzKCk7XHJcblx0XHRteUhlYWRlcnMuYXBwZW5kKCdDb250ZW50LVR5cGUnLCAnYXBwbGljYXRpb24vanNvbicpO1xyXG5cdFx0cmV0dXJuIHRoaXMuaHR0cC5mZXRjaCgnc25hcHNob3QnLCB7XHJcblx0XHRcdG1ldGhvZDogJ3Bvc3QnLFxyXG5cdFx0XHRoZWFkZXJzOiBteUhlYWRlcnMsXHJcblx0XHRcdGJvZHk6IEpTT04uc3RyaW5naWZ5KHtcclxuXHRcdFx0XHR1cmw6IHVybFxyXG5cdFx0XHR9KVxyXG5cdFx0fSlcclxuXHRcdC50aGVuKHJlc3BvbnNlID0+IHJlc3BvbnNlLmpzb24oKSlcclxuXHRcdC50aGVuKHNuYXBzaG90ID0+IHtcclxuXHRcdFx0dGhpcy5zbmFwc2hvdHMucHVzaChzbmFwc2hvdCk7XHJcblx0XHR9KTtcclxuXHR9XHJcblx0cmVtb3ZlKHNuYXBzaG90KXtcclxuXHRcdHRoaXMuaHR0cC5mZXRjaCgnc25hcHNob3QvJyArIHNuYXBzaG90Ll9pZCwge1xyXG5cdFx0XHRtZXRob2Q6ICdERUxFVEUnXHJcblx0XHR9KVxyXG5cdFx0LnRoZW4ocmVzcG9uc2UgPT4ge1xyXG5cdFx0XHR0aGlzLnNuYXBzaG90cy5zcGxpY2UodGhpcy5zbmFwc2hvdHMuaW5kZXhPZihzbmFwc2hvdCksIDEpO1xyXG5cdFx0fSk7XHJcblx0fVxyXG5cdGdldChpZCl7XHJcblx0XHRyZXR1cm4gdGhpcy5odHRwLmZldGNoKCdzbmFwc2hvdC8nICsgaWQsIHtcclxuXHRcdFx0bWV0aG9kOiAnR0VUJ1xyXG5cdFx0fSlcclxuXHRcdC50aGVuKHJlc3BvbnNlID0+IHJlc3BvbnNlLmpzb24oKSk7XHJcblx0fVxyXG59Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
diff --git a/client/dist/app-build-cd89144a80.js b/client/dist/app-build-cd89144a80.js
new file mode 100644
index 0000000..ad9c120
--- /dev/null
+++ b/client/dist/app-build-cd89144a80.js
@@ -0,0 +1 @@
+"bundle";!function(){var a=System.get("@@amd-helpers").createDefine();define("app.html!github:systemjs/plugin-text@0.0.3.js",[],function(){return'<template> <div class="page-host"> <router-view></router-view> </div> </template>'}),a()}(),System.register("app.js",[],function(a){"use strict";function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var c,d=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();return{setters:[],execute:function(){c=function(){function a(){b(this,a)}return d(a,[{key:"configureRouter",value:function(a,b){a.title="Frost",a.map([{route:[""],name:"index",moduleId:"views/index",nav:!0,title:"Frost"},{route:["/snapshot/:id"],name:"snapshot",moduleId:"views/snapshot",nav:!0,title:"Frost",href:"a"}]),this.router=b}}]),a}(),a("App",c)}}}),System.register("main.js",[],function(a){"use strict";function b(a){a.use.standardConfiguration().developmentLogging(),a.start().then(function(){return a.setRoot()})}return a("configure",b),{setters:[],execute:function(){}}});
\ No newline at end of file
diff --git a/client/dist/app-build-d5c126cdef.js b/client/dist/app-build-d5c126cdef.js
deleted file mode 100644
index 55fccdc..0000000
--- a/client/dist/app-build-d5c126cdef.js
+++ /dev/null
@@ -1 +0,0 @@
-"bundle";!function(){var a=System.get("@@amd-helpers").createDefine();define("add-snapshot-form.html!github:systemjs/plugin-text@0.0.3.js",[],function(){return'<template> <form submit.delegate="submit()" class="add-form"> <div class="form-wrapper"> <label for="url" class="sr-only"> URL: </label> <input type="url" value.bind="url" id="url" class="field" placeholder="http://example.com"> <input type="submit" value="save" class="btn"> <div class="bookmarklet"> Or use the <a href="javascript:(function(){var%20script=document.createElement(\'script\');script.src=\'${href}bm.js?\'+Math.floor((+new%20Date)/(864e5));document.body.appendChild(script);})()">Save in Frost</a> bookmarklet. </div> </div> </form> </template>'}),a()}(),System.register("add-snapshot-form.js",["aurelia-framework","SnapshotsDB"],function(a){"use strict";function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var c,d,e,f=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();return{setters:[function(a){c=a.inject},function(a){d=a.SnapshotsDB}],execute:function(){e=function(){function a(a){b(this,e),this.url="",this.href="",this.SnapshotsDB=a,this.href=window.location.href}f(a,[{key:"submit",value:function(){this.SnapshotsDB.add(this.url),this.url=""}}]);var e=a;return a=c(d)(a)||a}(),a("AddSnapshotForm",e)}}}),function(){var a=System.get("@@amd-helpers").createDefine();define("app.html!github:systemjs/plugin-text@0.0.3.js",[],function(){return'<template> <div class="page-host"> <router-view></router-view> </div> </template>'}),a()}(),System.register("app.js",[],function(a){"use strict";function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var c,d=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();return{setters:[],execute:function(){c=function(){function a(){b(this,a)}return d(a,[{key:"configureRouter",value:function(a,b){a.title="Frost",a.map([{route:[""],name:"index",moduleId:"index",nav:!0,title:"Frost"},{route:["/snapshot/:id"],name:"snapshot",moduleId:"snapshot",nav:!0,title:"Frost",href:"a"}]),this.router=b}}]),a}(),a("App",c)}}}),System.register("date-format.js",["moment"],function(a){"use strict";function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var c,d,e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();return{setters:[function(a){c=a["default"]}],execute:function(){d=function(){function a(){b(this,a)}return e(a,[{key:"toView",value:function(a){return c(a).fromNow()}}]),a}(),a("DateFormatValueConverter",d)}}}),function(){var a=System.get("@@amd-helpers").createDefine();define("index.html!github:systemjs/plugin-text@0.0.3.js",[],function(){return'<template> <require from="add-snapshot-form"></require> <require from="snapshots-list"></require> <div class="header"> <add-snapshot-form></add-snapshot-form> </div> <div class="main-container"> <snapshots-list></snapshots-list> </div> </template>'}),a()}(),System.register("index.js",[],function(a){"use strict";function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var c;return{setters:[],execute:function(){c=function d(){b(this,d)},a("Index",c)}}}),System.register("main.js",[],function(a){"use strict";function b(a){a.use.standardConfiguration().developmentLogging(),a.start().then(function(){return a.setRoot()})}return a("configure",b),{setters:[],execute:function(){}}}),function(){var a=System.get("@@amd-helpers").createDefine();define("snapshot.html!github:systemjs/plugin-text@0.0.3.js",[],function(){return'<template> <a route-href="route: index;" class="btn back"> ◀ back to Frost </a> <iframe src="${src}"></iframe> </template>'}),a()}(),System.register("snapshot.js",["aurelia-framework","SnapshotsDB"],function(a){"use strict";function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var c,d,e,f=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();return{setters:[function(a){c=a.inject},function(a){d=a.SnapshotsDB}],execute:function(){e=function(){function a(a){b(this,e),this.src="",this.SnapshotsDB=a}f(a,[{key:"activate",value:function(a){var b=this;this.SnapshotsDB.get(a.id).then(function(a){b.src=a.url})}}]);var e=a;return a=c(d)(a)||a}(),a("Snapshot",e)}}}),function(){var a=System.get("@@amd-helpers").createDefine();define("snapshots-list.html!github:systemjs/plugin-text@0.0.3.js",[],function(){return'<template> <require from="./date-format"></require> <div repeat.for="snapshot of snapshots" class="archive-item ${snapshot.processed ? \'\' : \'processing\'}"> <h4> <a route-href="route: snapshot; params.bind: {id: snapshot._id}" show.bind="snapshot.processed"> ${snapshot.title} </a> <span show.bind="!snapshot.processed"> ${snapshot.title} </span> </h4> <h3 show.bind="snapshot.processed"> ${snapshot.url} </h3> <p> ${snapshot.description} </p> <div class="archive-meta" show.bind="snapshot.processed"> <button click.trigger="removeSnapshot(snapshot)" class="btn btn-delete"> <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> delete </button> <span class="archived"> Archived ${snapshot.archived | dateFormat} </span> </div> </div> <div class="empty-screen" show.bind="snapshots.length == 0"> <img src="assets/flake.png" alt="The snowflake icon for Frost"> <h1> Save a copy of your favorite pages, forever. </h1> <p> You can use the form above or add this <a href="javascript:(function(){var%20script=document.createElement(\'script\');script.src=\'${href}bm.js?\'+Math.floor((+new%20Date)/(864e5));document.body.appendChild(script);})()">Save in Frost</a> bookmarklet to your browser\'s bookmarks. Activating it will save the page you\'re looking at without having to open up Frost! </p> </div> </template>'}),a()}(),System.register("SnapshotsDB.js",["aurelia-framework","aurelia-fetch-client"],function(a){"use strict";function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var c,d,e,f=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();return{setters:[function(a){c=a.inject},function(a){d=a.HttpClient}],execute:function(){e=function(){function a(a){var c=this;b(this,e),this.snapshots=[],a.configure(function(a){a.useStandardConfiguration()}),this.http=a,this.http.fetch("snapshots").then(function(a){return a.json()}).then(function(a){a.forEach(function(a){c.snapshots.push(a)})})}f(a,[{key:"getAll",value:function(){return this.snapshots}},{key:"add",value:function(a){var b=this,c=new Headers;return c.append("Content-Type","application/json"),this.http.fetch("snapshot",{method:"post",headers:c,body:JSON.stringify({url:a})}).then(function(a){return a.json()}).then(function(a){b.snapshots.push(a)})}},{key:"remove",value:function(a){var b=this;this.http.fetch("snapshot/"+a._id,{method:"DELETE"}).then(function(c){b.snapshots.splice(b.snapshots.indexOf(a),1)})}},{key:"get",value:function(a){return this.http.fetch("snapshot/"+a,{method:"GET"}).then(function(a){return a.json()})}}]);var e=a;return a=c(d)(a)||a}(),a("SnapshotsDB",e)}}}),System.register("snapshots-list.js",["aurelia-framework","SnapshotsDB"],function(a){"use strict";function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var c,d,e,f=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();return{setters:[function(a){c=a.inject},function(a){d=a.SnapshotsDB}],execute:function(){e=function(){function a(a){b(this,e),this.snapshots=[],this.href="",this.SnapshotsDB=a,this.href=window.location.href}f(a,[{key:"created",value:function(){this.snapshots=this.SnapshotsDB.getAll()}},{key:"removeSnapshot",value:function(a){this.SnapshotsDB.remove(a)}}]);var e=a;return a=c(d)(a)||a}(),a("SnapshotsList",e)}}});
\ No newline at end of file
diff --git a/client/dist/app.js b/client/dist/app.js
index b99d7aa..ea921f6 100644
--- a/client/dist/app.js
+++ b/client/dist/app.js
@@ -22,13 +22,13 @@ System.register([], function (_export) {
 												config.map([{
 														route: [''],
 														name: 'index',
-														moduleId: 'index',
+														moduleId: 'views/index',
 														nav: true,
 														title: 'Frost'
 												}, {
 														route: ['/snapshot/:id'],
 														name: 'snapshot',
-														moduleId: 'snapshot',
+														moduleId: 'views/snapshot',
 														nav: true,
 														title: 'Frost',
 														href: 'a'
@@ -45,4 +45,4 @@ System.register([], function (_export) {
 				}
 		};
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFwcC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7TUFBYSxHQUFHOzs7Ozs7Ozs7QUFBSCxTQUFHO2lCQUFILEdBQUc7Z0NBQUgsR0FBRzs7O3FCQUFILEdBQUc7O2lCQUNDLHlCQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUU7QUFDOUIsa0JBQU0sQ0FBQyxLQUFLLEdBQUcsT0FBTyxDQUFDO0FBQ3ZCLGtCQUFNLENBQUMsR0FBRyxDQUFDLENBQ1Q7QUFDRixtQkFBSyxFQUFFLENBQUMsRUFBRSxDQUFDO0FBQ1gsa0JBQUksRUFBRSxPQUFPO0FBQ2Isc0JBQVEsRUFBRSxPQUFPO0FBQ2pCLGlCQUFHLEVBQUUsSUFBSTtBQUNULG1CQUFLLEVBQUUsT0FBTzthQUNkLEVBQ0U7QUFDRixtQkFBSyxFQUFFLENBQUMsZUFBZSxDQUFDO0FBQ3hCLGtCQUFJLEVBQUUsVUFBVTtBQUNoQixzQkFBUSxFQUFFLFVBQVU7QUFDcEIsaUJBQUcsRUFBRSxJQUFJO0FBQ1QsbUJBQUssRUFBRSxPQUFPO0FBQ2Qsa0JBQUksRUFBRSxHQUFHO2FBQ1QsQ0FDQyxDQUFDLENBQUM7O0FBRUgsZ0JBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1dBQ3RCOzs7ZUF0QlUsR0FBRyIsImZpbGUiOiJhcHAuanMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY2xhc3MgQXBwIHtcbiAgY29uZmlndXJlUm91dGVyKGNvbmZpZywgcm91dGVyKSB7XG4gICAgY29uZmlnLnRpdGxlID0gJ0Zyb3N0JztcbiAgICBjb25maWcubWFwKFtcbiAgICAgIHtcblx0XHQgIHJvdXRlOiBbJyddLCBcblx0XHQgIG5hbWU6ICdpbmRleCcsICAgICBcblx0XHQgIG1vZHVsZUlkOiAnaW5kZXgnLCAgICAgIFxuXHRcdCAgbmF2OiB0cnVlLCBcblx0XHQgIHRpdGxlOiAnRnJvc3QnXG5cdCAgfSxcbiAgICAgIHtcblx0XHQgIHJvdXRlOiBbJy9zbmFwc2hvdC86aWQnXSxcblx0XHQgIG5hbWU6ICdzbmFwc2hvdCcsXG5cdFx0ICBtb2R1bGVJZDogJ3NuYXBzaG90Jyxcblx0XHQgIG5hdjogdHJ1ZSwgXG5cdFx0ICB0aXRsZTogJ0Zyb3N0Jyxcblx0XHQgIGhyZWY6ICdhJ1xuXHQgIH0sXG4gICAgXSk7XG5cbiAgICB0aGlzLnJvdXRlciA9IHJvdXRlcjtcbiAgfVxufVxuIl0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFwcC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7TUFBYSxHQUFHOzs7Ozs7Ozs7QUFBSCxTQUFHO2lCQUFILEdBQUc7Z0NBQUgsR0FBRzs7O3FCQUFILEdBQUc7O2lCQUNDLHlCQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUU7QUFDOUIsa0JBQU0sQ0FBQyxLQUFLLEdBQUcsT0FBTyxDQUFDO0FBQ3ZCLGtCQUFNLENBQUMsR0FBRyxDQUFDLENBQ1Q7QUFDRixtQkFBSyxFQUFFLENBQUMsRUFBRSxDQUFDO0FBQ1gsa0JBQUksRUFBRSxPQUFPO0FBQ2Isc0JBQVEsRUFBRSxhQUFhO0FBQ3ZCLGlCQUFHLEVBQUUsSUFBSTtBQUNULG1CQUFLLEVBQUUsT0FBTzthQUNkLEVBQ0U7QUFDRixtQkFBSyxFQUFFLENBQUMsZUFBZSxDQUFDO0FBQ3hCLGtCQUFJLEVBQUUsVUFBVTtBQUNoQixzQkFBUSxFQUFFLGdCQUFnQjtBQUMxQixpQkFBRyxFQUFFLElBQUk7QUFDVCxtQkFBSyxFQUFFLE9BQU87QUFDZCxrQkFBSSxFQUFFLEdBQUc7YUFDVCxDQUNDLENBQUMsQ0FBQzs7QUFFSCxnQkFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7V0FDdEI7OztlQXRCVSxHQUFHIiwiZmlsZSI6ImFwcC5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBjbGFzcyBBcHAge1xyXG4gIGNvbmZpZ3VyZVJvdXRlcihjb25maWcsIHJvdXRlcikge1xyXG4gICAgY29uZmlnLnRpdGxlID0gJ0Zyb3N0JztcclxuICAgIGNvbmZpZy5tYXAoW1xyXG4gICAgICB7XHJcblx0XHQgIHJvdXRlOiBbJyddLCBcclxuXHRcdCAgbmFtZTogJ2luZGV4JywgICAgIFxyXG5cdFx0ICBtb2R1bGVJZDogJ3ZpZXdzL2luZGV4JywgICAgICBcclxuXHRcdCAgbmF2OiB0cnVlLCBcclxuXHRcdCAgdGl0bGU6ICdGcm9zdCdcclxuXHQgIH0sXHJcbiAgICAgIHtcclxuXHRcdCAgcm91dGU6IFsnL3NuYXBzaG90LzppZCddLFxyXG5cdFx0ICBuYW1lOiAnc25hcHNob3QnLFxyXG5cdFx0ICBtb2R1bGVJZDogJ3ZpZXdzL3NuYXBzaG90JyxcclxuXHRcdCAgbmF2OiB0cnVlLCBcclxuXHRcdCAgdGl0bGU6ICdGcm9zdCcsXHJcblx0XHQgIGhyZWY6ICdhJ1xyXG5cdCAgfSxcclxuICAgIF0pO1xyXG5cclxuICAgIHRoaXMucm91dGVyID0gcm91dGVyO1xyXG4gIH1cclxufVxyXG4iXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=
diff --git a/client/dist/add-snapshot-form.html b/client/dist/components/add-snapshot-form.html
similarity index 66%
rename from client/dist/add-snapshot-form.html
rename to client/dist/components/add-snapshot-form.html
index 27417ba..2320506 100644
--- a/client/dist/add-snapshot-form.html
+++ b/client/dist/components/add-snapshot-form.html
@@ -1,4 +1,6 @@
 <template>
+	<require from="components/bookmarklet"></require>
+	
 	<form submit.delegate="submit()" class="add-form">
 		<div class="form-wrapper">
 			<label for="url" class="sr-only">
@@ -9,7 +11,7 @@
 			
 			<div class="bookmarklet">
 				Or use the
-				<a href="javascript:(function(){var%20script=document.createElement('script');script.src='${href}bm.js?'+Math.floor((+new%20Date)/(864e5));document.body.appendChild(script);})()">Save in Frost</a>
+				<bookmarklet></bookmarklet>
 				bookmarklet.
 			</div>
 		</div>
diff --git a/client/dist/add-snapshot-form.js b/client/dist/components/add-snapshot-form.js
similarity index 51%
rename from client/dist/add-snapshot-form.js
rename to client/dist/components/add-snapshot-form.js
index 6a34f00..43a5570 100644
--- a/client/dist/add-snapshot-form.js
+++ b/client/dist/components/add-snapshot-form.js
@@ -1,4 +1,4 @@
-System.register(['aurelia-framework', 'SnapshotsDB'], function (_export) {
+System.register(['aurelia-framework', 'services/SnapshotsDB'], function (_export) {
 	'use strict';
 
 	var inject, SnapshotsDB, AddSnapshotForm;
@@ -10,8 +10,8 @@ System.register(['aurelia-framework', 'SnapshotsDB'], function (_export) {
 	return {
 		setters: [function (_aureliaFramework) {
 			inject = _aureliaFramework.inject;
-		}, function (_SnapshotsDB) {
-			SnapshotsDB = _SnapshotsDB.SnapshotsDB;
+		}, function (_servicesSnapshotsDB) {
+			SnapshotsDB = _servicesSnapshotsDB.SnapshotsDB;
 		}],
 		execute: function () {
 			AddSnapshotForm = (function () {
@@ -42,4 +42,4 @@ System.register(['aurelia-framework', 'SnapshotsDB'], function (_export) {
 		}
 	};
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFkZC1zbmFwc2hvdC1mb3JtLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OzswQkFJYSxlQUFlOzs7Ozs7Ozs4QkFKcEIsTUFBTTs7OEJBQ04sV0FBVzs7O0FBR04sa0JBQWU7QUFJZixhQUpBLGVBQWUsQ0FJZCxXQUFXLEVBQUM7OztVQUh6QixHQUFHLEdBQUcsRUFBRTtVQUNSLElBQUksR0FBRyxFQUFFOztBQUdSLFNBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO0FBQy9CLFNBQUksQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7S0FDakM7O2lCQVBXLGVBQWU7O1lBUXJCLGtCQUFFO0FBQ1AsVUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQy9CLFVBQUksQ0FBQyxHQUFHLEdBQUcsRUFBRSxDQUFDO01BQ2Q7OzsyQkFYVyxlQUFlO0FBQWYsbUJBQWUsR0FEM0IsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUNQLGVBQWUsS0FBZixlQUFlO1dBQWYsZUFBZSIsImZpbGUiOiJhZGQtc25hcHNob3QtZm9ybS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7aW5qZWN0fSBmcm9tICdhdXJlbGlhLWZyYW1ld29yayc7XHJcbmltcG9ydCB7U25hcHNob3RzREJ9IGZyb20gJ1NuYXBzaG90c0RCJztcclxuXHJcbkBpbmplY3QoU25hcHNob3RzREIpXHJcbmV4cG9ydCBjbGFzcyBBZGRTbmFwc2hvdEZvcm17XHJcblx0dXJsID0gJyc7XHJcblx0aHJlZiA9ICcnO1xyXG4gXHJcbiBcdGNvbnN0cnVjdG9yKFNuYXBzaG90c0RCKXtcclxuXHRcdHRoaXMuU25hcHNob3RzREIgPSBTbmFwc2hvdHNEQjtcclxuXHRcdHRoaXMuaHJlZiA9IHdpbmRvdy5sb2NhdGlvbi5ocmVmO1xyXG5cdH1cclxuXHRzdWJtaXQoKXtcclxuXHRcdHRoaXMuU25hcHNob3RzREIuYWRkKHRoaXMudXJsKTtcclxuXHRcdHRoaXMudXJsID0gJyc7XHJcblx0fVxyXG59Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNvbXBvbmVudHMvYWRkLXNuYXBzaG90LWZvcm0uanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OzBCQUlhLGVBQWU7Ozs7Ozs7OzhCQUpwQixNQUFNOztzQ0FDTixXQUFXOzs7QUFHTixrQkFBZTtBQUlmLGFBSkEsZUFBZSxDQUlkLFdBQVcsRUFBQzs7O1VBSHpCLEdBQUcsR0FBRyxFQUFFO1VBQ1IsSUFBSSxHQUFHLEVBQUU7O0FBR1IsU0FBSSxDQUFDLFdBQVcsR0FBRyxXQUFXLENBQUM7QUFDL0IsU0FBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQztLQUNqQzs7aUJBUFcsZUFBZTs7WUFRckIsa0JBQUU7QUFDUCxVQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDL0IsVUFBSSxDQUFDLEdBQUcsR0FBRyxFQUFFLENBQUM7TUFDZDs7OzJCQVhXLGVBQWU7QUFBZixtQkFBZSxHQUQzQixNQUFNLENBQUMsV0FBVyxDQUFDLENBQ1AsZUFBZSxLQUFmLGVBQWU7V0FBZixlQUFlIiwiZmlsZSI6ImNvbXBvbmVudHMvYWRkLXNuYXBzaG90LWZvcm0uanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge2luamVjdH0gZnJvbSAnYXVyZWxpYS1mcmFtZXdvcmsnO1xyXG5pbXBvcnQge1NuYXBzaG90c0RCfSBmcm9tICdzZXJ2aWNlcy9TbmFwc2hvdHNEQic7XHJcblxyXG5AaW5qZWN0KFNuYXBzaG90c0RCKVxyXG5leHBvcnQgY2xhc3MgQWRkU25hcHNob3RGb3Jte1xyXG5cdHVybCA9ICcnO1xyXG5cdGhyZWYgPSAnJztcclxuIFxyXG4gXHRjb25zdHJ1Y3RvcihTbmFwc2hvdHNEQil7XHJcblx0XHR0aGlzLlNuYXBzaG90c0RCID0gU25hcHNob3RzREI7XHJcblx0XHR0aGlzLmhyZWYgPSB3aW5kb3cubG9jYXRpb24uaHJlZjtcclxuXHR9XHJcblx0c3VibWl0KCl7XHJcblx0XHR0aGlzLlNuYXBzaG90c0RCLmFkZCh0aGlzLnVybCk7XHJcblx0XHR0aGlzLnVybCA9ICcnO1xyXG5cdH1cclxufSJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==
diff --git a/client/dist/components/bookmarklet.html b/client/dist/components/bookmarklet.html
new file mode 100644
index 0000000..cfc1173
--- /dev/null
+++ b/client/dist/components/bookmarklet.html
@@ -0,0 +1,5 @@
+<template>
+	<a href="javascript:(function(){var%20script=document.createElement('script');script.src='${appPath}bm.js?'+Math.floor((+new%20Date)/(864e5));document.body.appendChild(script);})()">
+		Save in Frost
+	</a>
+</template>
\ No newline at end of file
diff --git a/client/dist/components/bookmarklet.js b/client/dist/components/bookmarklet.js
new file mode 100644
index 0000000..599a61b
--- /dev/null
+++ b/client/dist/components/bookmarklet.js
@@ -0,0 +1,23 @@
+System.register([], function (_export) {
+	'use strict';
+
+	var Bookmarklet;
+
+	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
+
+	return {
+		setters: [],
+		execute: function () {
+			Bookmarklet = function Bookmarklet() {
+				_classCallCheck(this, Bookmarklet);
+
+				this.appPath = '';
+
+				this.appPath = window.location.origin + window.location.pathname;
+			};
+
+			_export('Bookmarklet', Bookmarklet);
+		}
+	};
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNvbXBvbmVudHMvYm9va21hcmtsZXQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0tBQWEsV0FBVzs7Ozs7OztBQUFYLGNBQVcsR0FHWCxTQUhBLFdBQVcsR0FHVDswQkFIRixXQUFXOztTQUN2QixPQUFPLEdBQUcsRUFBRTs7QUFHWCxRQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDO0lBQ2pFIiwiZmlsZSI6ImNvbXBvbmVudHMvYm9va21hcmtsZXQuanMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY2xhc3MgQm9va21hcmtsZXR7XHJcblx0YXBwUGF0aCA9ICcnO1xyXG4gXHJcbiBcdGNvbnN0cnVjdG9yKCl7XHJcblx0XHR0aGlzLmFwcFBhdGggPSB3aW5kb3cubG9jYXRpb24ub3JpZ2luICsgd2luZG93LmxvY2F0aW9uLnBhdGhuYW1lO1xyXG5cdH1cclxufSJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==
diff --git a/client/dist/snapshots-list.html b/client/dist/components/snapshots-list.html
similarity index 71%
rename from client/dist/snapshots-list.html
rename to client/dist/components/snapshots-list.html
index 207ce3f..4c485b8 100644
--- a/client/dist/snapshots-list.html
+++ b/client/dist/components/snapshots-list.html
@@ -1,5 +1,6 @@
 <template>
-	<require from="./date-format"></require>
+	<require from="services/date-format"></require>
+	<require from="components/bookmarklet"></require>
 	
 	<div repeat.for="snapshot of snapshots" class="archive-item ${snapshot.processed ? '' : 'processing'}">
 		<h4>
@@ -13,9 +14,13 @@ <h4>
 		<h3 show.bind="snapshot.processed">
 			${snapshot.url}
 		</h3>
-		<p>
+		
+		<p show.bind="snapshot.processed">
 			${snapshot.description}
 		</p>
+		<p show.bind="!snapshot.processed">
+			Back up in progress, please wait…
+		</p>
 		
 		<div class="archive-meta" show.bind="snapshot.processed">
 			<button click.trigger="removeSnapshot(snapshot)" class="btn btn-delete">
@@ -29,13 +34,13 @@ <h3 show.bind="snapshot.processed">
 		</div>
 	</div>
 	
-	<div class="empty-screen" show.bind="snapshots.length == 0">
+	<div class="empty-screen" show.bind="snapshots.length == 0 && loaded">
 		<img src="assets/flake.png" alt="The snowflake icon for Frost" />
 		<h1>
 			Save a copy of your favorite pages, forever.
 		</h1>
 		<p>
-			You can use the form above or add this <a href="javascript:(function(){var%20script=document.createElement('script');script.src='${href}bm.js?'+Math.floor((+new%20Date)/(864e5));document.body.appendChild(script);})()">Save in Frost</a> bookmarklet to your browser's bookmarks.
+			You can use the form above or add this <bookmarklet></bookmarklet> bookmarklet to your browser's bookmarks.
 			Activating it will save the page you're looking at without having to open up Frost!
 		</p>
 	</div>
diff --git a/client/dist/components/snapshots-list.js b/client/dist/components/snapshots-list.js
new file mode 100644
index 0000000..bba9835
--- /dev/null
+++ b/client/dist/components/snapshots-list.js
@@ -0,0 +1,51 @@
+System.register(['aurelia-framework', 'services/SnapshotsDB'], function (_export) {
+	'use strict';
+
+	var inject, SnapshotsDB, SnapshotsList;
+
+	var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
+
+	return {
+		setters: [function (_aureliaFramework) {
+			inject = _aureliaFramework.inject;
+		}, function (_servicesSnapshotsDB) {
+			SnapshotsDB = _servicesSnapshotsDB.SnapshotsDB;
+		}],
+		execute: function () {
+			SnapshotsList = (function () {
+				function SnapshotsList(SnapshotsDB) {
+					_classCallCheck(this, _SnapshotsList);
+
+					this.snapshots = [];
+					this.loaded = false;
+					this.href = '';
+
+					this.SnapshotsDB = SnapshotsDB;
+					this.href = window.location.href;
+				}
+
+				_createClass(SnapshotsList, [{
+					key: 'created',
+					value: function created() {
+						this.snapshots = this.SnapshotsDB.getAll();
+						this.loaded = true;
+					}
+				}, {
+					key: 'removeSnapshot',
+					value: function removeSnapshot(snapshot) {
+						this.SnapshotsDB.remove(snapshot);
+					}
+				}]);
+
+				var _SnapshotsList = SnapshotsList;
+				SnapshotsList = inject(SnapshotsDB)(SnapshotsList) || SnapshotsList;
+				return SnapshotsList;
+			})();
+
+			_export('SnapshotsList', SnapshotsList);
+		}
+	};
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNvbXBvbmVudHMvc25hcHNob3RzLWxpc3QuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OzBCQUlhLGFBQWE7Ozs7Ozs7OzhCQUpsQixNQUFNOztzQ0FDTixXQUFXOzs7QUFHTixnQkFBYTtBQUtkLGFBTEMsYUFBYSxDQUtiLFdBQVcsRUFBQzs7O1VBSnhCLFNBQVMsR0FBRyxFQUFFO1VBQ2QsTUFBTSxHQUFHLEtBQUs7VUFDZCxJQUFJLEdBQUcsRUFBRTs7QUFHUixTQUFJLENBQUMsV0FBVyxHQUFHLFdBQVcsQ0FBQztBQUMvQixTQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO0tBQ2pDOztpQkFSVyxhQUFhOztZQVNsQixtQkFBRTtBQUNSLFVBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsQ0FBQztBQUMzQyxVQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQztNQUNuQjs7O1lBQ2Esd0JBQUMsUUFBUSxFQUFDO0FBQ3ZCLFVBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO01BQ2xDOzs7eUJBZlcsYUFBYTtBQUFiLGlCQUFhLEdBRHpCLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FDUCxhQUFhLEtBQWIsYUFBYTtXQUFiLGFBQWEiLCJmaWxlIjoiY29tcG9uZW50cy9zbmFwc2hvdHMtbGlzdC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7aW5qZWN0fSBmcm9tICdhdXJlbGlhLWZyYW1ld29yayc7XHJcbmltcG9ydCB7U25hcHNob3RzREJ9IGZyb20gJ3NlcnZpY2VzL1NuYXBzaG90c0RCJztcclxuXHJcbkBpbmplY3QoU25hcHNob3RzREIpXHJcbmV4cG9ydCBjbGFzcyBTbmFwc2hvdHNMaXN0e1xyXG5cdHNuYXBzaG90cyA9IFtdO1xyXG5cdGxvYWRlZCA9IGZhbHNlO1xyXG5cdGhyZWYgPSAnJztcclxuXHJcblx0Y29uc3RydWN0b3IoU25hcHNob3RzREIpe1xyXG5cdFx0dGhpcy5TbmFwc2hvdHNEQiA9IFNuYXBzaG90c0RCO1xyXG5cdFx0dGhpcy5ocmVmID0gd2luZG93LmxvY2F0aW9uLmhyZWY7XHJcblx0fVxyXG5cdGNyZWF0ZWQoKXtcclxuXHRcdHRoaXMuc25hcHNob3RzID0gdGhpcy5TbmFwc2hvdHNEQi5nZXRBbGwoKTtcclxuXHRcdHRoaXMubG9hZGVkID0gdHJ1ZTtcclxuXHR9XHJcblx0cmVtb3ZlU25hcHNob3Qoc25hcHNob3Qpe1xyXG5cdFx0dGhpcy5TbmFwc2hvdHNEQi5yZW1vdmUoc25hcHNob3QpO1xyXG5cdH1cclxufVxyXG5cclxuIl0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
diff --git a/client/dist/services/SnapshotsDB.js b/client/dist/services/SnapshotsDB.js
new file mode 100644
index 0000000..8d5c690
--- /dev/null
+++ b/client/dist/services/SnapshotsDB.js
@@ -0,0 +1,118 @@
+System.register(['aurelia-framework', 'aurelia-fetch-client'], function (_export) {
+	'use strict';
+
+	var inject, HttpClient, SnapshotsDB;
+
+	var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
+
+	return {
+		setters: [function (_aureliaFramework) {
+			inject = _aureliaFramework.inject;
+		}, function (_aureliaFetchClient) {
+			HttpClient = _aureliaFetchClient.HttpClient;
+		}],
+		execute: function () {
+			SnapshotsDB = (function () {
+				function SnapshotsDB(http) {
+					var _this = this;
+
+					_classCallCheck(this, _SnapshotsDB);
+
+					this.snapshots = [];
+
+					http.configure(function (config) {
+						config.useStandardConfiguration();
+					});
+
+					this.http = http;
+
+					this.http.fetch('snapshots').then(function (response) {
+						return response.json();
+					}).then(function (snapshots) {
+						snapshots.forEach(function (snapshot) {
+							_this.snapshots.push(snapshot);
+						});
+					});
+				}
+
+				_createClass(SnapshotsDB, [{
+					key: 'getAll',
+					value: function getAll() {
+						return this.snapshots;
+					}
+				}, {
+					key: 'add',
+					value: function add(url) {
+						var _this2 = this;
+
+						var myHeaders = new Headers();
+						myHeaders.append('Content-Type', 'application/json');
+						return this.http.fetch('snapshot', {
+							method: 'post',
+							headers: myHeaders,
+							body: JSON.stringify({
+								url: url
+							})
+						}).then(function (response) {
+							return response.json();
+						}).then(function (snapshot) {
+							_this2.snapshots.push(snapshot);
+							if (!snapshot.processed) _this2.observeSnapshotUntilProcessed(snapshot);
+						});
+					}
+				}, {
+					key: 'remove',
+					value: function remove(snapshot) {
+						var _this3 = this;
+
+						this.http.fetch('snapshot/' + snapshot._id, {
+							method: 'DELETE'
+						}).then(function (response) {
+							_this3.snapshots.splice(_this3.snapshots.indexOf(snapshot), 1);
+						});
+					}
+				}, {
+					key: 'get',
+					value: function get(id) {
+						return this.http.fetch('snapshot/' + id, {
+							method: 'GET'
+						}).then(function (response) {
+							return response.json();
+						});
+					}
+				}, {
+					key: 'getOne',
+					value: function getOne(id) {
+						return this.http.fetch('snapshots/' + id, {
+							method: 'GET'
+						}).then(function (response) {
+							return response.json();
+						});
+					}
+				}, {
+					key: 'observeSnapshotUntilProcessed',
+					value: function observeSnapshotUntilProcessed(snapshot) {
+						var _this4 = this;
+
+						setTimeout(function () {
+							_this4.getOne(snapshot._id).then(function (response) {
+								if (!response.processed) _this4.observeSnapshotUntilProcessed(snapshot);else {
+									_this4.snapshots.splice(_this4.snapshots.indexOf(snapshot), 1, response);
+								}
+							});
+						}, 1000);
+					}
+				}]);
+
+				var _SnapshotsDB = SnapshotsDB;
+				SnapshotsDB = inject(HttpClient)(SnapshotsDB) || SnapshotsDB;
+				return SnapshotsDB;
+			})();
+
+			_export('SnapshotsDB', SnapshotsDB);
+		}
+	};
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNlcnZpY2VzL1NuYXBzaG90c0RCLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozt5QkFJYSxXQUFXOzs7Ozs7Ozs4QkFKaEIsTUFBTTs7b0NBQ04sVUFBVTs7O0FBR0wsY0FBVztBQUdaLGFBSEMsV0FBVyxDQUdYLElBQUksRUFBQzs7Ozs7VUFGakIsU0FBUyxHQUFHLEVBQUU7O0FBR2IsU0FBSSxDQUFDLFNBQVMsQ0FBQyxVQUFBLE1BQU0sRUFBSTtBQUN4QixZQUFNLENBQ0osd0JBQXdCLEVBQUUsQ0FBQztNQUM3QixDQUFDLENBQUM7O0FBRUgsU0FBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7O0FBRWpCLFNBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUMzQixJQUFJLENBQUMsVUFBQSxRQUFRO2FBQUksUUFBUSxDQUFDLElBQUksRUFBRTtNQUFBLENBQUMsQ0FDakMsSUFBSSxDQUFDLFVBQUEsU0FBUyxFQUFJO0FBQ2xCLGVBQVMsQ0FBQyxPQUFPLENBQUMsVUFBQSxRQUFRLEVBQUk7QUFDN0IsYUFBSyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO09BQzlCLENBQUMsQ0FBQztNQUNILENBQUMsQ0FBQztLQUNIOztpQkFsQlcsV0FBVzs7WUFtQmpCLGtCQUFFO0FBQ1AsYUFBTyxJQUFJLENBQUMsU0FBUyxDQUFDO01BQ3RCOzs7WUFDRSxhQUFDLEdBQUcsRUFBQzs7O0FBQ1AsVUFBSSxTQUFTLEdBQUcsSUFBSSxPQUFPLEVBQUUsQ0FBQztBQUM5QixlQUFTLENBQUMsTUFBTSxDQUFDLGNBQWMsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO0FBQ3JELGFBQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsVUFBVSxFQUFFO0FBQ2xDLGFBQU0sRUFBRSxNQUFNO0FBQ2QsY0FBTyxFQUFFLFNBQVM7QUFDbEIsV0FBSSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUM7QUFDcEIsV0FBRyxFQUFFLEdBQUc7UUFDUixDQUFDO09BQ0YsQ0FBQyxDQUNELElBQUksQ0FBQyxVQUFBLFFBQVE7Y0FBSSxRQUFRLENBQUMsSUFBSSxFQUFFO09BQUEsQ0FBQyxDQUNqQyxJQUFJLENBQUMsVUFBQSxRQUFRLEVBQUk7QUFDakIsY0FBSyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQzlCLFdBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLE9BQUssNkJBQTZCLENBQUMsUUFBUSxDQUFDLENBQUM7T0FDdEUsQ0FBQyxDQUFDO01BQ0g7OztZQUNLLGdCQUFDLFFBQVEsRUFBQzs7O0FBQ2YsVUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVyxHQUFHLFFBQVEsQ0FBQyxHQUFHLEVBQUU7QUFDM0MsYUFBTSxFQUFFLFFBQVE7T0FDaEIsQ0FBQyxDQUNELElBQUksQ0FBQyxVQUFBLFFBQVEsRUFBSTtBQUNqQixjQUFLLFNBQVMsQ0FBQyxNQUFNLENBQUMsT0FBSyxTQUFTLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO09BQzNELENBQUMsQ0FBQztNQUNIOzs7WUFDRSxhQUFDLEVBQUUsRUFBQztBQUNOLGFBQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVyxHQUFHLEVBQUUsRUFBRTtBQUN4QyxhQUFNLEVBQUUsS0FBSztPQUNiLENBQUMsQ0FDRCxJQUFJLENBQUMsVUFBQSxRQUFRO2NBQUksUUFBUSxDQUFDLElBQUksRUFBRTtPQUFBLENBQUMsQ0FBQztNQUNuQzs7O1lBQ0ssZ0JBQUMsRUFBRSxFQUFDO0FBQ1QsYUFBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLEdBQUcsRUFBRSxFQUFFO0FBQ3pDLGFBQU0sRUFBRSxLQUFLO09BQ2IsQ0FBQyxDQUNELElBQUksQ0FBQyxVQUFBLFFBQVE7Y0FBSSxRQUFRLENBQUMsSUFBSSxFQUFFO09BQUEsQ0FBQyxDQUFDO01BQ25DOzs7WUFDNEIsdUNBQUMsUUFBUSxFQUFDOzs7QUFDdEMsZ0JBQVUsQ0FBQyxZQUFNO0FBQ2hCLGNBQUssTUFBTSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBQSxRQUFRLEVBQUk7QUFDMUMsWUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLEVBQUUsT0FBSyw2QkFBNkIsQ0FBQyxRQUFRLENBQUMsQ0FBQyxLQUNsRTtBQUNILGdCQUFLLFNBQVMsQ0FBQyxNQUFNLENBQUMsT0FBSyxTQUFTLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQztTQUNyRTtRQUNELENBQUMsQ0FBQztPQUNILEVBQUUsSUFBSSxDQUFDLENBQUM7TUFDVDs7O3VCQW5FVyxXQUFXO0FBQVgsZUFBVyxHQUR2QixNQUFNLENBQUMsVUFBVSxDQUFDLENBQ04sV0FBVyxLQUFYLFdBQVc7V0FBWCxXQUFXIiwiZmlsZSI6InNlcnZpY2VzL1NuYXBzaG90c0RCLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtpbmplY3R9IGZyb20gJ2F1cmVsaWEtZnJhbWV3b3JrJztcclxuaW1wb3J0IHtIdHRwQ2xpZW50fSBmcm9tICdhdXJlbGlhLWZldGNoLWNsaWVudCc7XHJcblxyXG5AaW5qZWN0KEh0dHBDbGllbnQpXHJcbmV4cG9ydCBjbGFzcyBTbmFwc2hvdHNEQntcclxuXHRzbmFwc2hvdHMgPSBbXTtcclxuXHJcblx0Y29uc3RydWN0b3IoaHR0cCl7XHJcblx0XHRodHRwLmNvbmZpZ3VyZShjb25maWcgPT4ge1xyXG5cdFx0XHRjb25maWdcclxuXHRcdFx0XHQudXNlU3RhbmRhcmRDb25maWd1cmF0aW9uKCk7XHJcblx0XHR9KTtcclxuXHRcdFxyXG5cdFx0dGhpcy5odHRwID0gaHR0cDtcclxuXHRcdFxyXG5cdFx0dGhpcy5odHRwLmZldGNoKCdzbmFwc2hvdHMnKVxyXG5cdFx0LnRoZW4ocmVzcG9uc2UgPT4gcmVzcG9uc2UuanNvbigpKVxyXG5cdFx0LnRoZW4oc25hcHNob3RzID0+IHtcclxuXHRcdFx0c25hcHNob3RzLmZvckVhY2goc25hcHNob3QgPT4ge1xyXG5cdFx0XHRcdHRoaXMuc25hcHNob3RzLnB1c2goc25hcHNob3QpO1xyXG5cdFx0XHR9KTtcclxuXHRcdH0pO1xyXG5cdH1cclxuXHRnZXRBbGwoKXtcclxuXHRcdHJldHVybiB0aGlzLnNuYXBzaG90cztcclxuXHR9XHJcblx0YWRkKHVybCl7XHJcblx0XHR2YXIgbXlIZWFkZXJzID0gbmV3IEhlYWRlcnMoKTtcclxuXHRcdG15SGVhZGVycy5hcHBlbmQoJ0NvbnRlbnQtVHlwZScsICdhcHBsaWNhdGlvbi9qc29uJyk7XHJcblx0XHRyZXR1cm4gdGhpcy5odHRwLmZldGNoKCdzbmFwc2hvdCcsIHtcclxuXHRcdFx0bWV0aG9kOiAncG9zdCcsXHJcblx0XHRcdGhlYWRlcnM6IG15SGVhZGVycyxcclxuXHRcdFx0Ym9keTogSlNPTi5zdHJpbmdpZnkoe1xyXG5cdFx0XHRcdHVybDogdXJsXHJcblx0XHRcdH0pXHJcblx0XHR9KVxyXG5cdFx0LnRoZW4ocmVzcG9uc2UgPT4gcmVzcG9uc2UuanNvbigpKVxyXG5cdFx0LnRoZW4oc25hcHNob3QgPT4ge1xyXG5cdFx0XHR0aGlzLnNuYXBzaG90cy5wdXNoKHNuYXBzaG90KTtcclxuXHRcdFx0aWYgKCFzbmFwc2hvdC5wcm9jZXNzZWQpIHRoaXMub2JzZXJ2ZVNuYXBzaG90VW50aWxQcm9jZXNzZWQoc25hcHNob3QpO1xyXG5cdFx0fSk7XHJcblx0fVxyXG5cdHJlbW92ZShzbmFwc2hvdCl7XHJcblx0XHR0aGlzLmh0dHAuZmV0Y2goJ3NuYXBzaG90LycgKyBzbmFwc2hvdC5faWQsIHtcclxuXHRcdFx0bWV0aG9kOiAnREVMRVRFJ1xyXG5cdFx0fSlcclxuXHRcdC50aGVuKHJlc3BvbnNlID0+IHtcclxuXHRcdFx0dGhpcy5zbmFwc2hvdHMuc3BsaWNlKHRoaXMuc25hcHNob3RzLmluZGV4T2Yoc25hcHNob3QpLCAxKTtcclxuXHRcdH0pO1xyXG5cdH1cclxuXHRnZXQoaWQpe1xyXG5cdFx0cmV0dXJuIHRoaXMuaHR0cC5mZXRjaCgnc25hcHNob3QvJyArIGlkLCB7XHJcblx0XHRcdG1ldGhvZDogJ0dFVCdcclxuXHRcdH0pXHJcblx0XHQudGhlbihyZXNwb25zZSA9PiByZXNwb25zZS5qc29uKCkpO1xyXG5cdH1cclxuXHRnZXRPbmUoaWQpe1xyXG5cdFx0cmV0dXJuIHRoaXMuaHR0cC5mZXRjaCgnc25hcHNob3RzLycgKyBpZCwge1xyXG5cdFx0XHRtZXRob2Q6ICdHRVQnXHJcblx0XHR9KVxyXG5cdFx0LnRoZW4ocmVzcG9uc2UgPT4gcmVzcG9uc2UuanNvbigpKTtcclxuXHR9XHJcblx0b2JzZXJ2ZVNuYXBzaG90VW50aWxQcm9jZXNzZWQoc25hcHNob3Qpe1xyXG5cdFx0c2V0VGltZW91dCgoKSA9PiB7XHJcblx0XHRcdHRoaXMuZ2V0T25lKHNuYXBzaG90Ll9pZCkudGhlbihyZXNwb25zZSA9PiB7XHJcblx0XHRcdFx0aWYgKCFyZXNwb25zZS5wcm9jZXNzZWQpIHRoaXMub2JzZXJ2ZVNuYXBzaG90VW50aWxQcm9jZXNzZWQoc25hcHNob3QpO1xyXG5cdFx0XHRcdGVsc2V7XHJcblx0XHRcdFx0XHR0aGlzLnNuYXBzaG90cy5zcGxpY2UodGhpcy5zbmFwc2hvdHMuaW5kZXhPZihzbmFwc2hvdCksIDEsIHJlc3BvbnNlKTtcclxuXHRcdFx0XHR9XHJcblx0XHRcdH0pO1xyXG5cdFx0fSwgMTAwMCk7XHJcblx0fVxyXG59Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
diff --git a/client/dist/date-format.js b/client/dist/services/date-format.js
similarity index 69%
rename from client/dist/date-format.js
rename to client/dist/services/date-format.js
index a086b9e..2170980 100644
--- a/client/dist/date-format.js
+++ b/client/dist/services/date-format.js
@@ -31,4 +31,4 @@ System.register(['moment'], function (_export) {
 		}
 	};
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImRhdGUtZm9ybWF0LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OzthQUVhLHdCQUF3Qjs7Ozs7Ozs7Ozs7QUFBeEIsMkJBQXdCO2FBQXhCLHdCQUF3QjsyQkFBeEIsd0JBQXdCOzs7aUJBQXhCLHdCQUF3Qjs7WUFDOUIsZ0JBQUMsS0FBSyxFQUFFO0FBQ2IsYUFBTyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7TUFDL0I7OztXQUhXLHdCQUF3QiIsImZpbGUiOiJkYXRlLWZvcm1hdC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBtb21lbnQgZnJvbSAnbW9tZW50JztcclxuXHJcbmV4cG9ydCBjbGFzcyBEYXRlRm9ybWF0VmFsdWVDb252ZXJ0ZXIge1xyXG5cdHRvVmlldyh2YWx1ZSkge1xyXG5cdFx0cmV0dXJuIG1vbWVudCh2YWx1ZSkuZnJvbU5vdygpO1xyXG5cdH1cclxufSJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNlcnZpY2VzL2RhdGUtZm9ybWF0LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OzthQUVhLHdCQUF3Qjs7Ozs7Ozs7Ozs7QUFBeEIsMkJBQXdCO2FBQXhCLHdCQUF3QjsyQkFBeEIsd0JBQXdCOzs7aUJBQXhCLHdCQUF3Qjs7WUFDOUIsZ0JBQUMsS0FBSyxFQUFFO0FBQ2IsYUFBTyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7TUFDL0I7OztXQUhXLHdCQUF3QiIsImZpbGUiOiJzZXJ2aWNlcy9kYXRlLWZvcm1hdC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBtb21lbnQgZnJvbSAnbW9tZW50JztcclxuXHJcbmV4cG9ydCBjbGFzcyBEYXRlRm9ybWF0VmFsdWVDb252ZXJ0ZXIge1xyXG5cdHRvVmlldyh2YWx1ZSkge1xyXG5cdFx0cmV0dXJuIG1vbWVudCh2YWx1ZSkuZnJvbU5vdygpO1xyXG5cdH1cclxufSJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==
diff --git a/client/dist/snapshots-list.js b/client/dist/snapshots-list.js
deleted file mode 100644
index aa725d0..0000000
--- a/client/dist/snapshots-list.js
+++ /dev/null
@@ -1,49 +0,0 @@
-System.register(['aurelia-framework', 'SnapshotsDB'], function (_export) {
-	'use strict';
-
-	var inject, SnapshotsDB, SnapshotsList;
-
-	var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
-
-	return {
-		setters: [function (_aureliaFramework) {
-			inject = _aureliaFramework.inject;
-		}, function (_SnapshotsDB) {
-			SnapshotsDB = _SnapshotsDB.SnapshotsDB;
-		}],
-		execute: function () {
-			SnapshotsList = (function () {
-				function SnapshotsList(SnapshotsDB) {
-					_classCallCheck(this, _SnapshotsList);
-
-					this.snapshots = [];
-					this.href = '';
-
-					this.SnapshotsDB = SnapshotsDB;
-					this.href = window.location.href;
-				}
-
-				_createClass(SnapshotsList, [{
-					key: 'created',
-					value: function created() {
-						this.snapshots = this.SnapshotsDB.getAll();
-					}
-				}, {
-					key: 'removeSnapshot',
-					value: function removeSnapshot(snapshot) {
-						this.SnapshotsDB.remove(snapshot);
-					}
-				}]);
-
-				var _SnapshotsList = SnapshotsList;
-				SnapshotsList = inject(SnapshotsDB)(SnapshotsList) || SnapshotsList;
-				return SnapshotsList;
-			})();
-
-			_export('SnapshotsList', SnapshotsList);
-		}
-	};
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNuYXBzaG90cy1saXN0LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OzswQkFJYSxhQUFhOzs7Ozs7Ozs4QkFKbEIsTUFBTTs7OEJBQ04sV0FBVzs7O0FBR04sZ0JBQWE7QUFJZCxhQUpDLGFBQWEsQ0FJYixXQUFXLEVBQUM7OztVQUh4QixTQUFTLEdBQUcsRUFBRTtVQUNkLElBQUksR0FBRyxFQUFFOztBQUdSLFNBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO0FBQy9CLFNBQUksQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7S0FDakM7O2lCQVBXLGFBQWE7O1lBUWxCLG1CQUFFO0FBQ1IsVUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sRUFBRSxDQUFDO01BQzNDOzs7WUFDYSx3QkFBQyxRQUFRLEVBQUM7QUFDdkIsVUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7TUFDbEM7Ozt5QkFiVyxhQUFhO0FBQWIsaUJBQWEsR0FEekIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUNQLGFBQWEsS0FBYixhQUFhO1dBQWIsYUFBYSIsImZpbGUiOiJzbmFwc2hvdHMtbGlzdC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7aW5qZWN0fSBmcm9tICdhdXJlbGlhLWZyYW1ld29yayc7XHJcbmltcG9ydCB7U25hcHNob3RzREJ9IGZyb20gJ1NuYXBzaG90c0RCJztcclxuXHJcbkBpbmplY3QoU25hcHNob3RzREIpXHJcbmV4cG9ydCBjbGFzcyBTbmFwc2hvdHNMaXN0e1xyXG5cdHNuYXBzaG90cyA9IFtdO1xyXG5cdGhyZWYgPSAnJztcclxuXHJcblx0Y29uc3RydWN0b3IoU25hcHNob3RzREIpe1xyXG5cdFx0dGhpcy5TbmFwc2hvdHNEQiA9IFNuYXBzaG90c0RCO1xyXG5cdFx0dGhpcy5ocmVmID0gd2luZG93LmxvY2F0aW9uLmhyZWY7XHJcblx0fVxyXG5cdGNyZWF0ZWQoKXtcclxuXHRcdHRoaXMuc25hcHNob3RzID0gdGhpcy5TbmFwc2hvdHNEQi5nZXRBbGwoKTtcclxuXHR9XHJcblx0cmVtb3ZlU25hcHNob3Qoc25hcHNob3Qpe1xyXG5cdFx0dGhpcy5TbmFwc2hvdHNEQi5yZW1vdmUoc25hcHNob3QpO1xyXG5cdH1cclxufVxyXG5cclxuIl0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
diff --git a/client/dist/index.html b/client/dist/views/index.html
similarity index 60%
rename from client/dist/index.html
rename to client/dist/views/index.html
index e7d60b4..6c4f8d7 100644
--- a/client/dist/index.html
+++ b/client/dist/views/index.html
@@ -1,6 +1,6 @@
 <template>
-	<require from="add-snapshot-form"></require>
-	<require from="snapshots-list"></require>
+	<require from="components/add-snapshot-form"></require>
+	<require from="components/snapshots-list"></require>
 	
 	<div class="header">
 		<add-snapshot-form></add-snapshot-form>
diff --git a/client/dist/index.js b/client/dist/views/index.js
similarity index 62%
rename from client/dist/index.js
rename to client/dist/views/index.js
index 8f0da6f..fcd9582 100644
--- a/client/dist/index.js
+++ b/client/dist/views/index.js
@@ -16,4 +16,4 @@ System.register([], function (_export) {
 		}
 	};
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztLQUFhLEtBQUs7Ozs7Ozs7QUFBTCxRQUFLLFlBQUwsS0FBSzswQkFBTCxLQUFLIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNsYXNzIEluZGV4e1xyXG5cdFxyXG59Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInZpZXdzL2luZGV4LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztLQUFhLEtBQUs7Ozs7Ozs7QUFBTCxRQUFLLFlBQUwsS0FBSzswQkFBTCxLQUFLIiwiZmlsZSI6InZpZXdzL2luZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNsYXNzIEluZGV4e1xyXG5cdFxyXG59Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
diff --git a/client/dist/snapshot.html b/client/dist/views/snapshot.html
similarity index 100%
rename from client/dist/snapshot.html
rename to client/dist/views/snapshot.html
diff --git a/client/dist/snapshot.js b/client/dist/views/snapshot.js
similarity index 52%
rename from client/dist/snapshot.js
rename to client/dist/views/snapshot.js
index ac521ea..217564e 100644
--- a/client/dist/snapshot.js
+++ b/client/dist/views/snapshot.js
@@ -1,4 +1,4 @@
-System.register(['aurelia-framework', 'SnapshotsDB'], function (_export) {
+System.register(['aurelia-framework', 'services/SnapshotsDB'], function (_export) {
 	'use strict';
 
 	var inject, SnapshotsDB, Snapshot;
@@ -10,8 +10,8 @@ System.register(['aurelia-framework', 'SnapshotsDB'], function (_export) {
 	return {
 		setters: [function (_aureliaFramework) {
 			inject = _aureliaFramework.inject;
-		}, function (_SnapshotsDB) {
-			SnapshotsDB = _SnapshotsDB.SnapshotsDB;
+		}, function (_servicesSnapshotsDB) {
+			SnapshotsDB = _servicesSnapshotsDB.SnapshotsDB;
 		}],
 		execute: function () {
 			Snapshot = (function () {
@@ -43,4 +43,4 @@ System.register(['aurelia-framework', 'SnapshotsDB'], function (_export) {
 		}
 	};
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNuYXBzaG90LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OzswQkFJYSxRQUFROzs7Ozs7Ozs4QkFKYixNQUFNOzs4QkFDTixXQUFXOzs7QUFHTixXQUFRO0FBR1QsYUFIQyxRQUFRLENBR1IsV0FBVyxFQUFDOzs7VUFGeEIsR0FBRyxHQUFHLEVBQUU7O0FBR1AsU0FBSSxDQUFDLFdBQVcsR0FBRyxXQUFXLENBQUM7S0FDL0I7O2lCQUxXLFFBQVE7O1lBTVosa0JBQUMsTUFBTSxFQUFDOzs7QUFDZixVQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQzlCLElBQUksQ0FBQyxVQUFBLFFBQVEsRUFBSTtBQUNqQixhQUFLLEdBQUcsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO09BQ3hCLENBQUMsQ0FBQTtNQUNGOzs7b0JBWFcsUUFBUTtBQUFSLFlBQVEsR0FEcEIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUNQLFFBQVEsS0FBUixRQUFRO1dBQVIsUUFBUSIsImZpbGUiOiJzbmFwc2hvdC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7aW5qZWN0fSBmcm9tICdhdXJlbGlhLWZyYW1ld29yayc7XHJcbmltcG9ydCB7U25hcHNob3RzREJ9IGZyb20gJ1NuYXBzaG90c0RCJztcclxuXHJcbkBpbmplY3QoU25hcHNob3RzREIpXHJcbmV4cG9ydCBjbGFzcyBTbmFwc2hvdHtcclxuXHRzcmMgPSAnJztcclxuXHJcblx0Y29uc3RydWN0b3IoU25hcHNob3RzREIpe1xyXG5cdFx0dGhpcy5TbmFwc2hvdHNEQiA9IFNuYXBzaG90c0RCO1xyXG5cdH1cclxuXHRhY3RpdmF0ZShwYXJhbXMpe1xyXG5cdFx0dGhpcy5TbmFwc2hvdHNEQi5nZXQocGFyYW1zLmlkKVxyXG5cdFx0LnRoZW4ocmVzcG9uc2UgPT4ge1xyXG5cdFx0XHR0aGlzLnNyYyA9IHJlc3BvbnNlLnVybDtcclxuXHRcdH0pXHJcblx0fVxyXG59Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInZpZXdzL3NuYXBzaG90LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OzswQkFJYSxRQUFROzs7Ozs7Ozs4QkFKYixNQUFNOztzQ0FDTixXQUFXOzs7QUFHTixXQUFRO0FBR1QsYUFIQyxRQUFRLENBR1IsV0FBVyxFQUFDOzs7VUFGeEIsR0FBRyxHQUFHLEVBQUU7O0FBR1AsU0FBSSxDQUFDLFdBQVcsR0FBRyxXQUFXLENBQUM7S0FDL0I7O2lCQUxXLFFBQVE7O1lBTVosa0JBQUMsTUFBTSxFQUFDOzs7QUFDZixVQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQzlCLElBQUksQ0FBQyxVQUFBLFFBQVEsRUFBSTtBQUNqQixhQUFLLEdBQUcsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO09BQ3hCLENBQUMsQ0FBQTtNQUNGOzs7b0JBWFcsUUFBUTtBQUFSLFlBQVEsR0FEcEIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUNQLFFBQVEsS0FBUixRQUFRO1dBQVIsUUFBUSIsImZpbGUiOiJ2aWV3cy9zbmFwc2hvdC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7aW5qZWN0fSBmcm9tICdhdXJlbGlhLWZyYW1ld29yayc7XHJcbmltcG9ydCB7U25hcHNob3RzREJ9IGZyb20gJ3NlcnZpY2VzL1NuYXBzaG90c0RCJztcclxuXHJcbkBpbmplY3QoU25hcHNob3RzREIpXHJcbmV4cG9ydCBjbGFzcyBTbmFwc2hvdHtcclxuXHRzcmMgPSAnJztcclxuXHJcblx0Y29uc3RydWN0b3IoU25hcHNob3RzREIpe1xyXG5cdFx0dGhpcy5TbmFwc2hvdHNEQiA9IFNuYXBzaG90c0RCO1xyXG5cdH1cclxuXHRhY3RpdmF0ZShwYXJhbXMpe1xyXG5cdFx0dGhpcy5TbmFwc2hvdHNEQi5nZXQocGFyYW1zLmlkKVxyXG5cdFx0LnRoZW4ocmVzcG9uc2UgPT4ge1xyXG5cdFx0XHR0aGlzLnNyYyA9IHJlc3BvbnNlLnVybDtcclxuXHRcdH0pXHJcblx0fVxyXG59Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
diff --git a/package.json b/package.json
index 0f710d7..f7af790 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "cozy-archives",
   "cozy-displayName": "Frost",
   "icon-path": "icon.png",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Save a copy of your favorite web pages, forever.",
   "main": "server.js",
   "scripts": {
diff --git a/server.js b/server.js
index 594ad10..2d21899 100644
--- a/server.js
+++ b/server.js
@@ -25,7 +25,7 @@ app.use(snapshotsController);
     Start the HTTP server.
 */
 cozydb.configure(__dirname, null, function(){
-	var server = app.listen(9255, function (){
+	var server = app.listen(process.env.PORT || 9255, function (){
 		var host = server.address().address;
 		var port = server.address().port;
 
diff --git a/server/controllers/snapshots.js b/server/controllers/snapshots.js
index cb16d3b..4e8951e 100644
--- a/server/controllers/snapshots.js
+++ b/server/controllers/snapshots.js
@@ -15,20 +15,39 @@ router.get('/snapshots', function(req, res, next){
 	});
 });
 
+router.get('/snapshots/:id', function(req, res, next){
+	PageSnapshot.find(req.params.id, function(err, page){
+		if (err) next(err);
+		else{
+			res.status(200).json(page);
+		}
+	});
+});
+
 router.get('/snapshot/:id', function(req, res, next){
 	PageSnapshot.find(req.params.id, function(err, page){
 		if (err) next(err);
 		else if (!page) next();
 		else{
-			var stream = page.getBinary(page.slug + '.tar.gz', function(err){
-				if (err) next(err);
-				else res.status(200).json({url: 'cache/' + page.slug + '/'});
-			});
-			
-			var pumpify = require('pumpify');
-			var untar = pumpify(zlib.createGunzip(), tar.extract(__dirname + '/../../client/cache/' + page.slug));
+			var extractionPath = __dirname + '/../../client/cache/' + page.slug;
 			
-			stream.pipe(untar);
+			//check if the page is already in cache
+			fs.stat(extractionPath, function(err, stats){
+				if (err){
+					var stream = page.getBinary(page.slug + '.tar.gz', function(err){
+						if (err) next(err);
+						else res.status(200).json({url: 'cache/' + page.slug + '/'});
+					});
+
+					var pumpify = require('pumpify');
+					var untar = pumpify(zlib.createGunzip(), tar.extract(extractionPath));
+
+					stream.pipe(untar);
+				}
+				else{
+					res.status(200).json({url: 'cache/' + page.slug + '/'});
+				}
+			});
 		}
 	});
 });
@@ -58,7 +77,7 @@ router.post('/snapshot', function(req, res, next){
 	//create the DB entry
 	Q.ninvoke(PageSnapshot, 'create', {
 		'title': url,
-		'description':'Back up in progress.',
+		'description': url,
 		'url': url,
 		'slug': slug,
 		'processed': false,
diff --git a/src/app.js b/src/app.js
index 7f38ba5..7c39bd2 100644
--- a/src/app.js
+++ b/src/app.js
@@ -5,14 +5,14 @@ export class App {
       {
 		  route: [''], 
 		  name: 'index',     
-		  moduleId: 'index',      
+		  moduleId: 'views/index',      
 		  nav: true, 
 		  title: 'Frost'
 	  },
       {
 		  route: ['/snapshot/:id'],
 		  name: 'snapshot',
-		  moduleId: 'snapshot',
+		  moduleId: 'views/snapshot',
 		  nav: true, 
 		  title: 'Frost',
 		  href: 'a'
diff --git a/src/add-snapshot-form.html b/src/components/add-snapshot-form.html
similarity index 66%
rename from src/add-snapshot-form.html
rename to src/components/add-snapshot-form.html
index 27417ba..2320506 100644
--- a/src/add-snapshot-form.html
+++ b/src/components/add-snapshot-form.html
@@ -1,4 +1,6 @@
 <template>
+	<require from="components/bookmarklet"></require>
+	
 	<form submit.delegate="submit()" class="add-form">
 		<div class="form-wrapper">
 			<label for="url" class="sr-only">
@@ -9,7 +11,7 @@
 			
 			<div class="bookmarklet">
 				Or use the
-				<a href="javascript:(function(){var%20script=document.createElement('script');script.src='${href}bm.js?'+Math.floor((+new%20Date)/(864e5));document.body.appendChild(script);})()">Save in Frost</a>
+				<bookmarklet></bookmarklet>
 				bookmarklet.
 			</div>
 		</div>
diff --git a/src/add-snapshot-form.js b/src/components/add-snapshot-form.js
similarity index 85%
rename from src/add-snapshot-form.js
rename to src/components/add-snapshot-form.js
index 2a8be09..1ffe17f 100644
--- a/src/add-snapshot-form.js
+++ b/src/components/add-snapshot-form.js
@@ -1,5 +1,5 @@
 import {inject} from 'aurelia-framework';
-import {SnapshotsDB} from 'SnapshotsDB';
+import {SnapshotsDB} from 'services/SnapshotsDB';
 
 @inject(SnapshotsDB)
 export class AddSnapshotForm{
diff --git a/src/components/bookmarklet.html b/src/components/bookmarklet.html
new file mode 100644
index 0000000..cfc1173
--- /dev/null
+++ b/src/components/bookmarklet.html
@@ -0,0 +1,5 @@
+<template>
+	<a href="javascript:(function(){var%20script=document.createElement('script');script.src='${appPath}bm.js?'+Math.floor((+new%20Date)/(864e5));document.body.appendChild(script);})()">
+		Save in Frost
+	</a>
+</template>
\ No newline at end of file
diff --git a/src/components/bookmarklet.js b/src/components/bookmarklet.js
new file mode 100644
index 0000000..8016412
--- /dev/null
+++ b/src/components/bookmarklet.js
@@ -0,0 +1,7 @@
+export class Bookmarklet{
+	appPath = '';
+ 
+ 	constructor(){
+		this.appPath = window.location.origin + window.location.pathname;
+	}
+}
\ No newline at end of file
diff --git a/src/snapshots-list.html b/src/components/snapshots-list.html
similarity index 71%
rename from src/snapshots-list.html
rename to src/components/snapshots-list.html
index 207ce3f..4c485b8 100644
--- a/src/snapshots-list.html
+++ b/src/components/snapshots-list.html
@@ -1,5 +1,6 @@
 <template>
-	<require from="./date-format"></require>
+	<require from="services/date-format"></require>
+	<require from="components/bookmarklet"></require>
 	
 	<div repeat.for="snapshot of snapshots" class="archive-item ${snapshot.processed ? '' : 'processing'}">
 		<h4>
@@ -13,9 +14,13 @@ <h4>
 		<h3 show.bind="snapshot.processed">
 			${snapshot.url}
 		</h3>
-		<p>
+		
+		<p show.bind="snapshot.processed">
 			${snapshot.description}
 		</p>
+		<p show.bind="!snapshot.processed">
+			Back up in progress, please wait…
+		</p>
 		
 		<div class="archive-meta" show.bind="snapshot.processed">
 			<button click.trigger="removeSnapshot(snapshot)" class="btn btn-delete">
@@ -29,13 +34,13 @@ <h3 show.bind="snapshot.processed">
 		</div>
 	</div>
 	
-	<div class="empty-screen" show.bind="snapshots.length == 0">
+	<div class="empty-screen" show.bind="snapshots.length == 0 && loaded">
 		<img src="assets/flake.png" alt="The snowflake icon for Frost" />
 		<h1>
 			Save a copy of your favorite pages, forever.
 		</h1>
 		<p>
-			You can use the form above or add this <a href="javascript:(function(){var%20script=document.createElement('script');script.src='${href}bm.js?'+Math.floor((+new%20Date)/(864e5));document.body.appendChild(script);})()">Save in Frost</a> bookmarklet to your browser's bookmarks.
+			You can use the form above or add this <bookmarklet></bookmarklet> bookmarklet to your browser's bookmarks.
 			Activating it will save the page you're looking at without having to open up Frost!
 		</p>
 	</div>
diff --git a/src/snapshots-list.js b/src/components/snapshots-list.js
similarity index 79%
rename from src/snapshots-list.js
rename to src/components/snapshots-list.js
index 1fc3ed4..ce562dc 100644
--- a/src/snapshots-list.js
+++ b/src/components/snapshots-list.js
@@ -1,9 +1,10 @@
 import {inject} from 'aurelia-framework';
-import {SnapshotsDB} from 'SnapshotsDB';
+import {SnapshotsDB} from 'services/SnapshotsDB';
 
 @inject(SnapshotsDB)
 export class SnapshotsList{
 	snapshots = [];
+	loaded = false;
 	href = '';
 
 	constructor(SnapshotsDB){
@@ -12,6 +13,7 @@ export class SnapshotsList{
 	}
 	created(){
 		this.snapshots = this.SnapshotsDB.getAll();
+		this.loaded = true;
 	}
 	removeSnapshot(snapshot){
 		this.SnapshotsDB.remove(snapshot);
diff --git a/src/SnapshotsDB.js b/src/services/SnapshotsDB.js
similarity index 69%
rename from src/SnapshotsDB.js
rename to src/services/SnapshotsDB.js
index 8e1d0f0..153c416 100644
--- a/src/SnapshotsDB.js
+++ b/src/services/SnapshotsDB.js
@@ -37,6 +37,7 @@ export class SnapshotsDB{
 		.then(response => response.json())
 		.then(snapshot => {
 			this.snapshots.push(snapshot);
+			if (!snapshot.processed) this.observeSnapshotUntilProcessed(snapshot);
 		});
 	}
 	remove(snapshot){
@@ -53,4 +54,20 @@ export class SnapshotsDB{
 		})
 		.then(response => response.json());
 	}
+	getOne(id){
+		return this.http.fetch('snapshots/' + id, {
+			method: 'GET'
+		})
+		.then(response => response.json());
+	}
+	observeSnapshotUntilProcessed(snapshot){
+		setTimeout(() => {
+			this.getOne(snapshot._id).then(response => {
+				if (!response.processed) this.observeSnapshotUntilProcessed(snapshot);
+				else{
+					this.snapshots.splice(this.snapshots.indexOf(snapshot), 1, response);
+				}
+			});
+		}, 1000);
+	}
 }
\ No newline at end of file
diff --git a/src/date-format.js b/src/services/date-format.js
similarity index 100%
rename from src/date-format.js
rename to src/services/date-format.js
diff --git a/src/index.html b/src/views/index.html
similarity index 60%
rename from src/index.html
rename to src/views/index.html
index e7d60b4..6c4f8d7 100644
--- a/src/index.html
+++ b/src/views/index.html
@@ -1,6 +1,6 @@
 <template>
-	<require from="add-snapshot-form"></require>
-	<require from="snapshots-list"></require>
+	<require from="components/add-snapshot-form"></require>
+	<require from="components/snapshots-list"></require>
 	
 	<div class="header">
 		<add-snapshot-form></add-snapshot-form>
diff --git a/src/index.js b/src/views/index.js
similarity index 100%
rename from src/index.js
rename to src/views/index.js
diff --git a/src/snapshot.html b/src/views/snapshot.html
similarity index 100%
rename from src/snapshot.html
rename to src/views/snapshot.html
diff --git a/src/snapshot.js b/src/views/snapshot.js
similarity index 84%
rename from src/snapshot.js
rename to src/views/snapshot.js
index e602bae..a6c5a58 100644
--- a/src/snapshot.js
+++ b/src/views/snapshot.js
@@ -1,5 +1,5 @@
 import {inject} from 'aurelia-framework';
-import {SnapshotsDB} from 'SnapshotsDB';
+import {SnapshotsDB} from 'services/SnapshotsDB';
 
 @inject(SnapshotsDB)
 export class Snapshot{