diff --git a/BuildServer/.gitignore b/BuildServer/.gitignore
index 285b65b..86f6aa2 100644
--- a/BuildServer/.gitignore
+++ b/BuildServer/.gitignore
@@ -18,5 +18,6 @@ data
 *.crt
 settings.js
 settings.ts
+*.d.ts
 
 iisnode
diff --git a/BuildServer/package.json b/BuildServer/package.json
index ae07877..dcaca7b 100644
--- a/BuildServer/package.json
+++ b/BuildServer/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "scripts": {
     "start": "forever -c node app.js",
-    "test": "./node_modules/.bin/eslint ."
+    "test": "./node_modules/.bin/eslint .",
+    "tslint": "./node_modules/.bin/tslint --project tsconfig.json --type-check --force"
   },
   "dependencies": {
     "archiver": "^1.3.0",
@@ -133,6 +134,6 @@
   "devDependencies": {
     "@types/node": "^7.0.5",
     "tslint": "^4.4.2",
-    "typescript": "^2.1.6"
+    "typescript": "^2.2.1"
   }
 }
diff --git a/BuildServer/tsconfig.json b/BuildServer/tsconfig.json
index fe3b5ae..be0fb57 100644
--- a/BuildServer/tsconfig.json
+++ b/BuildServer/tsconfig.json
@@ -1,8 +1,15 @@
 {
     "compilerOptions": {
+        "module": "commonjs",
         "target": "es6",
         "typeRoots": [
             "node_modules/@types"
         ]
-    }
+    },
+    "include": [
+        "app.ts",
+        "settings.ts",
+        "lib/**/*.ts",
+        "routes/**/*.ts"
+    ]
 }
diff --git a/BuildServer/tslint.json b/BuildServer/tslint.json
new file mode 100644
index 0000000..1a58f91
--- /dev/null
+++ b/BuildServer/tslint.json
@@ -0,0 +1,101 @@
+{
+    "jsRules": {
+        "class-name": true,
+        "comment-format": [
+            true,
+            "check-space"
+        ],
+        "indent": [
+            true,
+            "spaces"
+        ],
+        "no-duplicate-variable": true,
+        "no-eval": true,
+        "no-trailing-whitespace": true,
+        "no-unsafe-finally": true,
+        "one-line": [
+            true,
+            "check-open-brace",
+            "check-whitespace"
+        ],
+        "quotemark": [
+            true,
+            "double"
+        ],
+        "semicolon": [
+            true,
+            "always"
+        ],
+        "triple-equals": [
+            true,
+            "allow-null-check"
+        ],
+        "variable-name": [
+            true,
+            "ban-keywords"
+        ],
+        "whitespace": [
+            true,
+            "check-branch",
+            "check-decl",
+            "check-operator",
+            "check-separator",
+            "check-type"
+        ]
+    },
+    "rules": {
+        "class-name": true,
+        "comment-format": [
+            true,
+            "check-space"
+        ],
+        "indent": [
+            true,
+            "spaces"
+        ],
+        "no-eval": true,
+        "no-internal-module": true,
+        "no-trailing-whitespace": true,
+        "no-unsafe-finally": true,
+        "no-var-keyword": true,
+        "one-line": [
+            true,
+            "check-open-brace",
+            "check-whitespace"
+        ],
+        "quotemark": [
+            true,
+            "double"
+        ],
+        "semicolon": [
+            true,
+            "always"
+        ],
+        "triple-equals": [
+            true,
+            "allow-null-check"
+        ],
+        "typedef-whitespace": [
+            true,
+            {
+                "call-signature": "nospace",
+                "index-signature": "nospace",
+                "parameter": "nospace",
+                "property-declaration": "nospace",
+                "variable-declaration": "nospace"
+            }
+        ],
+        "variable-name": [
+            true,
+            "ban-keywords"
+        ],
+        "whitespace": [
+            true,
+            "check-branch",
+            "check-decl",
+            "check-operator",
+            "check-separator",
+            "check-type"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/BuildServer/typings.json b/BuildServer/typings.json
new file mode 100644
index 0000000..7b7ef5e
--- /dev/null
+++ b/BuildServer/typings.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "debug": "registry:npm/debug#2.0.0+20160723033700"
+  }
+}