diff --git a/services/chat/Gruntfile.coffee b/services/chat/Gruntfile.coffee
index 4ba1604d6f..0fdf47bfb7 100644
--- a/services/chat/Gruntfile.coffee
+++ b/services/chat/Gruntfile.coffee
@@ -2,6 +2,10 @@ module.exports = (grunt) ->
 
 	# Project configuration.
 	grunt.initConfig
+		execute:
+			app:
+				src: "app.js"
+
 		coffee:
 			client: 
 				expand: true,
@@ -115,9 +119,13 @@ module.exports = (grunt) ->
 	grunt.loadNpmTasks 'grunt-concurrent'
 	grunt.loadNpmTasks 'grunt-mocha-test'
 	grunt.loadNpmTasks 'grunt-plato'
+	grunt.loadNpmTasks 'grunt-execute'
+	grunt.loadNpmTasks 'grunt-bunyan'
+	
 
 	grunt.registerTask 'compile', ['clean',  'copy', 'coffee', 'less', 'jade', 'requirejs']
 	grunt.registerTask 'install', ['compile']
+	grunt.registerTask 'run', ['compile', 'bunyan', 'execute']
 	grunt.registerTask 'compileAndCompress', ['compile', 'uglify']
 	grunt.registerTask 'default', ['compile', 'concurrent']
 	grunt.registerTask 'test:unit', ['compile', 'mochaTest:unit']
diff --git a/services/chat/app.coffee b/services/chat/app.coffee
index ba8ec252bb..b06ddf728a 100644
--- a/services/chat/app.coffee
+++ b/services/chat/app.coffee
@@ -1,5 +1,11 @@
 logger = require 'logger-sharelatex'
+settings = require 'settings-sharelatex'
 
 Server = require "./app/js/server"
-Server.server.listen(3010, "localhost")
-logger.log "chat sharelatex listening on port 3010"
\ No newline at end of file
+
+port = settings.internal?.chat?.port or 3010
+host = settings.internal?.chat?.host or "localhost"
+
+Server.server.listen port, host, (error) ->
+	throw error if error?
+	logger.log "chat-sharelatex listening on #{host}:#{port}"
\ No newline at end of file
diff --git a/services/chat/config/settings.defaults.coffee b/services/chat/config/settings.defaults.coffee
index d37bb95a2e..bd35a94ef6 100644
--- a/services/chat/config/settings.defaults.coffee
+++ b/services/chat/config/settings.defaults.coffee
@@ -1,9 +1,15 @@
 module.exports =
+	internal:
+		chat:
+			host: "localhost"
+			port: 3010
+	
 	apis:
 		web:
 			url: "http://localhost:3000"
 			user: "sharelatex"
 			pass: "password"
+			
 	mongo:
 		url : 'mongodb://127.0.0.1/sharelatex'
 
diff --git a/services/chat/package.json b/services/chat/package.json
index 1ec29048fe..8e761299e8 100644
--- a/services/chat/package.json
+++ b/services/chat/package.json
@@ -18,22 +18,25 @@
     "timekeeper": "0.0.4"
   },
   "devDependencies": {
+    "bunyan": "^1.0.0",
     "chai": "",
+    "grunt": "~0.4.1",
+    "grunt-bunyan": "^0.5.0",
+    "grunt-concurrent": "~0.4.2",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-coffee": "~0.7.0",
+    "grunt-contrib-copy": "~0.4.1",
+    "grunt-contrib-jade": "~0.8.0",
+    "grunt-contrib-less": "~0.8.2",
+    "grunt-contrib-requirejs": "~0.4.1",
+    "grunt-contrib-uglify": "~0.2.7",
+    "grunt-contrib-watch": "~0.5.3",
+    "grunt-execute": "^0.2.2",
+    "grunt-nodemon": "~0.1.2",
+    "grunt-notify": "~0.2.16",
+    "grunt-plato": "~0.2.1",
     "sandboxed-module": "",
     "sinon": "",
-    "timekeeper": "",
-    "grunt": "~0.4.1",
-    "grunt-contrib-requirejs": "~0.4.1",
-    "grunt-contrib-coffee": "~0.7.0",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-less": "~0.8.2",
-    "grunt-contrib-jade": "~0.8.0",
-    "grunt-contrib-uglify": "~0.2.7",
-    "grunt-nodemon": "~0.1.2",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-concurrent": "~0.4.2",
-    "grunt-plato": "~0.2.1",
-    "grunt-notify": "~0.2.16"
+    "timekeeper": ""
   }
 }