diff --git a/.gitignore b/.gitignore
index 87ba6df7..d90e943a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,6 @@ target/
 
 # Virtualenv
 virtualenv/
+
+# debug database
+debug.db
diff --git a/Procfile b/Procfile
index 47780994..d9bc71ca 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: gunicorn todo.main:app --log-file -
+web: gunicorn todo:app --log-file -
diff --git a/run_debug_server.py b/run_debug_server.py
new file mode 100755
index 00000000..b7464b4f
--- /dev/null
+++ b/run_debug_server.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python3
+from todo import app
+from todo.database import init_db
+
+if __name__ == "__main__":
+    init_db()
+    app.run(debug=True, threaded=True)
diff --git a/todo/__init__.py b/todo/__init__.py
index dddc1c0b..29ed6de7 100644
--- a/todo/__init__.py
+++ b/todo/__init__.py
@@ -2,7 +2,7 @@
 from flask import Flask
 from flask.ext.cors import CORS
 
-DATABASE=os.getenv("DATABASE_URL", "sqlite://")
+DATABASE=os.getenv("DATABASE_URL", "sqlite:///debug.db")
 DATABASE=DATABASE.strip()
 
 app = Flask(__name__)
diff --git a/todo/database.py b/todo/database.py
index 67b607b2..c00557b2 100644
--- a/todo/database.py
+++ b/todo/database.py
@@ -1,4 +1,4 @@
-from todo.main import app
+from todo import app
 
 from sqlalchemy import create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker
diff --git a/todo/main.py b/todo/main.py
deleted file mode 100755
index aa6d7c4f..00000000
--- a/todo/main.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python3
-from todo import app
-
-if __name__ == "__main__":
-    app.run()