diff --git a/.gitignore b/.gitignore
index 8addd76..1d39037 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+config
 dump.rdb
 resources/
 pom.xml
diff --git a/Makefile b/Makefile
index 76e4dd3..c815de1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+run:
+	lein run dev
+
 server:
 	lein cljsbuild auto &
 	redis-server &
diff --git a/src/NoteHub/server.clj b/src/NoteHub/server.clj
index 107d18a..953f45a 100644
--- a/src/NoteHub/server.clj
+++ b/src/NoteHub/server.clj
@@ -4,7 +4,7 @@
 (server/load-views "src/NoteHub/views/")
 
 (defn -main [& m]
-  (let [mode (keyword (or (first m) :dev))
+  (let [mode (keyword (or (first m) :prod))
         port (Integer. (get (System/getenv) "PORT" "8080"))]
     (server/start port {:mode mode
                         :ns 'NoteHub})))
diff --git a/src/NoteHub/storage.clj b/src/NoteHub/storage.clj
index a5a56e1..1c26c71 100644
--- a/src/NoteHub/storage.clj
+++ b/src/NoteHub/storage.clj
@@ -1,7 +1,11 @@
 (ns NoteHub.storage
+  (:use [NoteHub.config])
   (:require [clj-redis.client :as redis]))
 
-(def db (redis/init))
+(def db 
+  (redis/init
+    (when noir.options/dev-mode? 
+      {:url (config-map :db-url)})))
 
 (def note "note")
 
diff --git a/src/NoteHub/views/pages.clj b/src/NoteHub/views/pages.clj
index efd8661..5c12451 100644
--- a/src/NoteHub/views/pages.clj
+++ b/src/NoteHub/views/pages.clj
@@ -43,6 +43,7 @@
 
 (page-setter 404 "Nothing Found.")
 (page-setter 400 "Bad request.")
+(page-setter 500 "OMG, Server Exploded.")
 
 ; Routes
 ; ======