diff --git a/config/config.js b/config/config.js
index 8e1fbbe..3496723 100644
--- a/config/config.js
+++ b/config/config.js
@@ -79,6 +79,7 @@ var bitcoindConf = {
 var enableMailbox = process.env.ENABLE_MAILBOX === 'true';
 var enableRatelimiter = process.env.ENABLE_RATELIMITER === 'true';
 var loggerLevel = process.env.LOGGER_LEVEL || 'info';
+var enableHTTPS = process.env.ENABLE_HTTPS === 'true'; 
 
 if (!fs.existsSync(db)) {
   var err = fs.mkdirSync(db);
@@ -94,6 +95,7 @@ module.exports = {
   enableMailbox: enableMailbox,
   enableRatelimiter: enableRatelimiter,
   loggerLevel: loggerLevel,
+  enableHTTPS: enableHTTPS,
   version: version,
   root: rootPath,
   publicPath: process.env.INSIGHT_PUBLIC_PATH || false,
diff --git a/config/express.js b/config/express.js
index af91681..1d6fb62 100644
--- a/config/express.js
+++ b/config/express.js
@@ -37,6 +37,7 @@ module.exports = function(app, historicSync, peerSync) {
   app.use(express.compress());
 
   app.use(function(req, res, next) {
+    console.log('asdasdasdasd');
     res.setHeader('Access-Control-Allow-Origin', '*');
     res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
     res.setHeader('Access-Control-Allow-Headers', 'X-Requested-With,content-type');
diff --git a/insight.js b/insight.js
index bb7c05b..77dbf93 100755
--- a/insight.js
+++ b/insight.js
@@ -8,6 +8,8 @@ var fs = require('fs');
 var PeerSync = require('./lib/PeerSync');
 var HistoricSync = require('./lib/HistoricSync');
 
+var http = require('http');
+var https = require('https');
 var express = require('express');
 var program = require('commander');
 
@@ -60,6 +62,17 @@ program.parse(process.argv);
 // create express app
 var expressApp = express();
 
+
+// setup http/https base server
+var protocol = config.enableHTTPS ? https : http;
+var serverOpts = {};
+if (config.enableHTTPS) {
+  serverOpts.key = fs.readFileSync('./etc/test-key.pem');
+  serverOpts.cert = fs.readFileSync('./etc/test-cert.pem');
+}
+var server = protocol.createServer(serverOpts, expressApp);
+console.log(config.enableHTTPS);
+
 // Bootstrap models
 var models_path = __dirname + '/app/models';
 var walk = function(path) {
@@ -112,7 +125,6 @@ if (peerSync) peerSync.allowReorgs = true;
 
 
 // socket.io
-var server = require('http').createServer(expressApp);
 var ios = require('socket.io')(server, config);
 require('./app/controllers/socket.js').init(ios);