diff --git a/.gitignore b/.gitignore
index 2a9441f..fecc907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,6 @@ npm-debug.log
 webpage/js/env_variables.js
 client/dist
 src/webserver/access.log
-seasoned_api/conf/development.json
+./seasoned_api/conf/
 yarn-error.log
 */yarn.lock
diff --git a/seasoned_api/conf/development.json b/seasoned_api/conf/development.json
new file mode 100644
index 0000000..e349515
--- /dev/null
+++ b/seasoned_api/conf/development.json
@@ -0,0 +1,24 @@
+{
+	"database": {
+		"host": "../shows.db"
+	},
+	"webserver": {
+		"port": 31459
+	},
+	"tmdb": {
+		"apiKey": ""
+	},
+	"raven": {
+		"DSN": ""
+	},
+	"mail": {
+		"host": "",
+		"user": "",
+		"password": "",
+		"user_pi": "",
+		"password_pi": ""
+	},
+	"authentication": {
+    		"secret": ""
+    	}
+}
diff --git a/seasoned_api/conf/output.log b/seasoned_api/conf/output.log
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/seasoned_api/conf/output.log
@@ -0,0 +1 @@
+
diff --git a/seasoned_api/src/webserver/app.js b/seasoned_api/src/webserver/app.js
index 58d7498..6b4d888 100644
--- a/seasoned_api/src/webserver/app.js
+++ b/seasoned_api/src/webserver/app.js
@@ -3,8 +3,10 @@ const Raven = require('raven');
 const bodyParser = require('body-parser');
 const tokenToUser = require('./middleware/tokenToUser');
 const mustBeAuthenticated = require('./middleware/mustBeAuthenticated');
+const configuration = require('src/config/configuration').getInstance();
 
-Raven.config('__DSN__').install();
+// TODO: Have our raven router check if there is a value, if not don't enable raven. 
+Raven.config(configuration.get('raven', 'DSN')).install();
 const app = express(); // define our app using express
 app.use(Raven.requestHandler());
 // this will let us get the data from a POST
@@ -20,13 +22,16 @@ const port = 31459; // set our port
 const router = express.Router();
 const allowedOrigins = ['https://kevinmidboe.com', 'http://localhost:8080'];
 
+// TODO: All JSON handling in a single router
 // router.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: true }));
 
 
+// This is probably a correct middleware/router setup
 /* Decode the Authorization header if provided */
 router.use(tokenToUser);
 
+// TODO: Should have a separate middleware/router for handling headers.
 router.use((req, res, next) => {
   // TODO add logging of all incoming
   console.log('Request: ', req.originalUrl);