diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..dccaa7b
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,35 @@
+{
+    "rules": {
+        "no-console": [ 0 ],
+        "no-unused-vars": [ 0 ],
+        "indent": [
+            2,
+            2
+        ],
+        "quotes": [
+            1,
+            "single"
+        ],
+        "linebreak-style": [
+            2,
+            "unix"
+        ],
+        "semi": [
+            1,
+            "never"
+        ]
+    },
+    "env": {
+        "es6": true,
+        "node": true,
+        "browser": true
+    },
+    "extends": "eslint:recommended",
+    "ecmaFeatures": {
+        "jsx": true,
+        "experimentalObjectRestSpread": true
+    },
+    "plugins": [
+        "react"
+    ]
+}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 9bec3e2..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "asi": true,
-  "esnext": true
-}
diff --git a/gulpfile.js b/gulpfile.js
index aac7f1c..ec1d4a5 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,7 +3,6 @@ var source = require('vinyl-source-stream')
 var buffer = require('vinyl-buffer')
 var minifyCss = require('gulp-minify-css')
 var browserify = require('browserify')
-var reactify = require('reactify') // Transforms React JSX to JS
 var uglify = require('gulp-uglify')
 var clean = require('gulp-clean')
 var connect = require('gulp-connect')
@@ -34,6 +33,7 @@ gulp.task('html',function(){
 gulp.task('js',function(){
   browserify(config.files.mainJs)
       .transform('babelify', { presets: [ 'es2015', 'react' ]})
+      .transform('eslintify')
       .bundle()
       .on('error', console.error.bind(console))
       .pipe(source('app.js')) // do this or browserify won't work
@@ -43,17 +43,19 @@ gulp.task('js',function(){
       .pipe(connect.reload())
 })
 
+
+
 gulp.task('clean',function(){
   gulp.src(config.dest, { read: false })
       .pipe(clean())
 })
 
-gulp.task('serve',function(){
+gulp.task('server',function(){
   connect.server({
     root: config.dest,
     port: 9090,
     livereload: true
-  });
+  })
 })
 
 gulp.task('watch',function(){
@@ -62,4 +64,6 @@ gulp.task('watch',function(){
   gulp.watch(config.files.css,['css'])
 })
 
-gulp.task('default', [ 'html', 'css', 'js', 'watch', 'serve' ])
+gulp.task('serve', [ 'html', 'css', 'js', 'watch', 'server' ])
+
+gulp.task('default', [ 'html', 'css', 'js' ])
diff --git a/lib/boards-api-http.js b/lib/boards-api-http.js
index 44a7b83..fb4ead3 100644
--- a/lib/boards-api-http.js
+++ b/lib/boards-api-http.js
@@ -6,7 +6,6 @@ var app = express()
 // Generates a callback function to pass the API response to HTTP
 var apiToHandler = function(request,response){
   return (function(a,b){
-    var req = a
     var res = b
     return function(err,r){
       if(err){
diff --git a/lib/boards-api.js b/lib/boards-api.js
index a5cc9f8..b65a031 100644
--- a/lib/boards-api.js
+++ b/lib/boards-api.js
@@ -4,8 +4,6 @@ js-ipfs-api that also provides an additional level of caching for this
 particular application. Let's hope it turns out decent
 */
 
-var moment = require('moment')
-
 function asObj(str,done){
   var obj
   try {
@@ -134,7 +132,7 @@ BoardsAPI.prototype.getName = function(userID,done){
 
 BoardsAPI.prototype.getBoardSettings = function(userID,board,done){
   var url = userID+'/boards/'+board+'/settings.json'
-  console.log("Getting Board Settings:",url)
+  console.log('Getting Board Settings:',url)
   this.ipfs.cat(url,function(err,res){
     console.log('Done')
     if(err){
diff --git a/package.json b/package.json
index 0b03f7e..4193655 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,9 @@
     "babelify": "^7.2.0",
     "browserify": "^12.0.1",
     "commander": "^2.9.0",
+    "eslint": "^1.9.0",
+    "eslint-plugin-react": "^3.8.0",
+    "eslintify": "0.0.3",
     "express": "^4.13.3",
     "gulp": "^3.9.0",
     "gulp-clean": "^0.3.1",
diff --git a/server/server.js b/server/server.js
index c64b3cd..a7275df 100755
--- a/server/server.js
+++ b/server/server.js
@@ -5,13 +5,12 @@ var BoardsAPI = require('../lib/boards-api.js')
 var BoardsAPIHttp = require('../lib/boards-api-http.js')
 
 var boards = new BoardsAPI(ipfs)
-var server
 
 boards.init(function(err){
   if(err){
     console.log(err)
   } else {
-    server = BoardsAPIHttp(boards)
+    BoardsAPIHttp(boards)
     // setInterval(boards.searchUsers.bind(boards),3 * 60 * 1000)
     // boards.searchUsers()
   }
diff --git a/webapp/app.jsx b/webapp/app.jsx
index d79d9f0..25664b2 100644
--- a/webapp/app.jsx
+++ b/webapp/app.jsx
@@ -4,4 +4,4 @@ var ReactDOM = require('react-dom')
 ReactDOM.render(
   <h1>Hello, world!</h1>,
   document.getElementById('container')
-);
+)