diff --git a/app.py b/app.py
index ee46265..170e22a 100644
--- a/app.py
+++ b/app.py
@@ -1,4 +1,6 @@
-import server as moduleContainingApp
+import server as server
 
 def createApp(envivorment=None, start_response=None):
-    return moduleContainingApp.app
+    with server.app.app_context():
+        server.create_app()
+    return server.app
diff --git a/server.py b/server.py
index 66ef123..6182c44 100755
--- a/server.py
+++ b/server.py
@@ -156,9 +156,7 @@ def default():
     else:
         return ("Method not implemented: {}".format(flask.request.method), 405)
 
-
-@app.before_first_request
-def init():
+def create_app():
     
     db.create_all()
     config = {}
@@ -189,4 +187,8 @@ if __name__ == "__main__":
     parser.add_argument('--port', default="5000", help='Port to run on')
 
     args = parser.parse_args()
+
+    with app.app_context():
+        create_app()
+
     app.run(host=args.interface, port=args.port)