diff --git a/package.json b/package.json
index ee650c7..6de6d27 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "start": "node src/index.js",
     "dev": "nodemon src/index.js --watch src",
     "gendoc": "jsdoc -r ./src/ ./client/ -c ./jsdoc.json -d ./jsdoc/",
+    "lint": "eslint src --ext .js && eslint client --ext .js",
     "setup": "npm i"
   },
   "author": "Ben Kyd <benjaminkyd@gmail.com> (https://benkyd.co.uk)",
diff --git a/src/__test/.eslintignore b/src/__test/.eslintignore
new file mode 100644
index 0000000..e69de29
diff --git a/src/database/database.js b/src/database/database.js
index e0d1ec3..20b058e 100644
--- a/src/database/database.js
+++ b/src/database/database.js
@@ -18,7 +18,7 @@ class Database {
                 host: process.env.DATABASE_HOST,
                 database: process.env.DATABASE_DB,
                 password: process.env.DATABASE_PASSWORD,
-                port: process.env.DATABASE_PORT
+                port: process.env.DATABASE_PORT,
             };
         }
 
@@ -29,7 +29,7 @@ class Database {
     }
 
     async connectToDatabase() {
-        const con =  new Promise((resolve, reject) => {
+        const con = new Promise((resolve, reject) => {
             const psqlClient = new Client(this.options);
 
             psqlClient.connect();
@@ -59,5 +59,5 @@ class Database {
 module.exports = {
     IDatabase: Database,
     DataTypes: require('./psql-entity-framework/types.js'),
-    DataConstraints: require('./psql-entity-framework/relationships_constraints.js')
-}
+    DataConstraints: require('./psql-entity-framework/relationships_constraints.js'),
+};
diff --git a/src/database/psql-entity-framework/entity-relationships.js b/src/database/psql-entity-framework/entity-relationships.js
index f98c0b2..8258756 100644
--- a/src/database/psql-entity-framework/entity-relationships.js
+++ b/src/database/psql-entity-framework/entity-relationships.js
@@ -20,7 +20,7 @@ const Model = require('./model.js');
 class PSQLObjectRelation {
     constructor(psqlConnection) {
         Logger.Database('ORM Loading...');
-        this.connection = psqlConnection;;
+        this.connection = psqlConnection;
         this.models = [];
         // dummyModels are for models that have requested a model that doesn't exist
         // the model that doesn't exist will be added here, and once it is added, the
@@ -78,7 +78,7 @@ class PSQLObjectRelation {
             if (typeof model[key] !== 'object') {
                 const type = model[key];
                 model[key] = {
-                    type: type,
+                    type,
                     constraints: [],
                 };
             }
@@ -97,8 +97,6 @@ class PSQLObjectRelation {
     // TODO: Make this more maintainable
     resolveDepends() {
 
-        
-
     }
 
     /**
diff --git a/src/database/psql-entity-framework/relationships_constraints.js b/src/database/psql-entity-framework/relationships_constraints.js
index 3152821..296ad41 100644
--- a/src/database/psql-entity-framework/relationships_constraints.js
+++ b/src/database/psql-entity-framework/relationships_constraints.js
@@ -1,6 +1,6 @@
 class RelationshipTypes {
     static get PRIMARY_KEY() {
-        return "PRIMARY KEY";
+        return 'PRIMARY KEY';
     }
 
     static get UNIQUE() {
@@ -22,7 +22,7 @@ class RelationshipTypes {
 
     // ONE TO ONE RELATIONSHIP, again ER framework will handle this
     static FOREIGN_KEY_121(type, references) {
-        return { fk: { ref: references }, type: type, constraints: [ this.UNIQUE ] };
+        return { fk: { ref: references }, type, constraints: [this.UNIQUE] };
     }
 }
 
diff --git a/src/models/model-manager.js b/src/models/model-manager.js
index 52db7e0..cbda260 100644
--- a/src/models/model-manager.js
+++ b/src/models/model-manager.js
@@ -16,4 +16,4 @@ function init(databaseInstance) {
 
 module.exports = {
     Init: init,
-}
+};
diff --git a/src/routes/server.js b/src/routes/server.js
index 4ed151a..86ed022 100644
--- a/src/routes/server.js
+++ b/src/routes/server.js
@@ -3,9 +3,8 @@ const Logger = require('../logger.js');
 const express = require('express');
 const app = express();
 
-function logRequest(req, res, next)
-{
-    Logger.Middleware('REQUEST', `${req.originalUrl} [${req.method}: ${req.headers['x-forwarded-for'] || req.socket.remoteAddress }]`);
+function logRequest(req, res, next) {
+    Logger.Middleware('REQUEST', `${req.originalUrl} [${req.method}: ${req.headers['x-forwarded-for'] || req.socket.remoteAddress}]`);
     next();
 }