diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000..82ff623
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,5 @@
+**/node_modules/*
+**/vendor/*
+**/*.min.js
+**/coverage/*
+**/build/*
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..b663d77
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,21 @@
+{
+  "rules": {
+    "no-console": "off",
+    "indent": [ "error", 2 ],
+    "quotes": [ "error", "single" ],
+    "semi": ["error", "always"],
+    "linebreak-style": [ "error", "unix" ]
+  },
+  "env": {
+    "es6": true,
+    "node": true,
+    "mocha": true,
+    "jasmine": true
+  },
+  "ecmaFeatures": {
+    "modules": true,
+    "experimentalObjectRestSpread": true,
+    "impliedStrict": true
+  },
+  "extends": "eslint:recommended"
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..393ef53
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,136 @@
+# Created by https://www.gitignore.io/api/osx,vim,node,macos,windows
+
+### macOS ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+
+### OSX ###
+
+# Icon must end with two \r
+
+# Thumbnails
+
+# Files that might appear in the root of a volume
+
+# Directories potentially created on remote AFP share
+
+### Vim ###
+# swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.gitignore.io/api/osx,vim,node,macos,windows
\ No newline at end of file
diff --git a/README.md b/README.md
index 8d00d0f..e69de29 100644
--- a/README.md
+++ b/README.md
@@ -1,35 +0,0 @@
-![cf](https://i.imgur.com/7v5ASc8.png) 12: Express Middleware
-======
-
-## Submission Instructions
-  * fork this repository & create a new branch for your work
-  * write all of your code in a directory named `lab-` + `<your name>` **e.g.** `lab-susan`
-  * push to your repository
-  * submit a pull request to this repository
-  * submit a link to your PR in canvas
-  * write a question and observation on canvas
-
-## Learning Objectives  
-* students will be able to work with application, router, and 3rd party middleware through the use of express.js
-* students will be able to implement custom middleware through the use of express.js
-* students will be able to create custom routers for a specific resource
-
-## Requirements
-
-#### Configuration
-* `package.json`
-* `.eslintrc`
-* `.gitignore`
-* `README.md`
-  * your `README.md` should include detailed instructions on how to use your API
-
-#### Feature Tasks
-* create a single resource `express` API that can handle **GET**, **POST**, and **PUT** requests
-* use the `http-errors` module to create new errors and associate them with a proper status code
-* create an `error-middleware` module to handle errors and *use* it in your server file
-* create a `cors-middleware` module that will allow for public use of your API
-* create the `deleteItem` and `availIDs` methods and add them to your `storage` module
-  * these methods should be used to delete a resource (`deleteItem`) and return an array of id's from persisted resource filenames (`availIDs`)
-* create the `updateNote`, `fetchNote`, and `fetchIDs` static methods as part of your `Note` model
-* create a series of `note-route-tests` to test your **GET**, **POST**, and **PUT** routes
-  * **hint:** *you'll want to use the `before` and `after` hooks provided by `mocha` in order to create a test note and delete the note after the test has completed*
diff --git a/data/pokemon/undefined.json b/data/pokemon/undefined.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/data/pokemon/undefined.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/lib/cors-middleware.js b/lib/cors-middleware.js
new file mode 100644
index 0000000..0e2c326
--- /dev/null
+++ b/lib/cors-middleware.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = function(req,res,next){
+  res.append('Access-Control-Allow-Origin', '*');
+  res.append('Access-Control-Allow-Headers', '*');
+  next();
+};
\ No newline at end of file
diff --git a/lib/error-middleware.js b/lib/error-middleware.js
new file mode 100644
index 0000000..d5e5f96
--- /dev/null
+++ b/lib/error-middleware.js
@@ -0,0 +1,21 @@
+'use strict';
+
+const createError = require('http-errors');
+const debug = require('debug')('pokemon:error-middleware');
+
+module.exports = function(err, req, res, next ){
+  console.error(err.message);
+
+  if (err.status){
+    debug('user error');
+
+    res.status(err.status).send(err.name);
+    next();
+    return;
+  }
+
+  debug('server errror');
+  err = createError(500, err.message);
+  res.status(err.status).send(err.name);
+  next();
+};
\ No newline at end of file
diff --git a/lib/storage.js b/lib/storage.js
new file mode 100644
index 0000000..aeebb76
--- /dev/null
+++ b/lib/storage.js
@@ -0,0 +1,57 @@
+'use strict';
+
+const Promise = require('bluebird');
+const fs = Promise.promisifyAll(require('fs'), {suffix: 'Prom'});
+const createError = require('http-errors');
+const debug = require('debug')('pokemon:storage');
+
+module.exports = exports = {};
+
+exports.createItem = function(schemaName, item){
+  debug('createItem');
+
+  if (!schemaName) return Promise.reject(createError(400, 'expected schema name'));
+  if (!item) return Promise.reject(createError(400, 'expected item'));
+
+  let json = JSON.stringify(item);
+  return fs.writeFileProm(`${__dirname}/../data/${schemaName}/${item.id}.json`, json)
+  .then( () => item)
+  .catch( err => Promise.reject(createError(500, err.message)));
+};
+
+exports.fetchItem = function(schemaName, id){
+  debug('fetchItem');
+
+  if (!schemaName) return Promise.reject(createError(400, 'expected schema name'));
+  if (!id) return Promise.reject(createError(400, 'expected id'));
+
+  return fs.readFileProm(`${__dirname}/../data/${schemaName}/${id}.json`)
+  .then(data => {
+    try {
+      let item = JSON.parse(data.toString());
+      return item;
+    } catch (err) {
+      return Promise.reject(createError(500, err.message));
+    }
+  })
+  .catch(err => Promise.reject(createError(404, err.message)));
+};
+
+
+exports.deleteItem = function(schemaName, id) {
+  debug('deleteItem');
+
+  if (!schemaName) return Promise.reject(createError(400, 'expected schema name'));
+  if (!id) return Promise.reject(createError(400, 'expected id'));
+
+  return fs.unlinkProm(`${__dirname}/../data/${schemaName}/${id}.json`)
+  .catch( err => Promise.reject(createError(404, err.message)));
+};
+
+
+exports.availIDs = function(schemaName) {
+  debug('available ids');
+  return fs.readdirProm(`${__dirname}/../data/${schemaName}`)
+  .then( files => files.map(name => name.split('.json')[0]))
+  .catch( err => Promise.reject(createError(404, err.message)));
+};
\ No newline at end of file
diff --git a/model/pokemon.js b/model/pokemon.js
new file mode 100644
index 0000000..4655cc6
--- /dev/null
+++ b/model/pokemon.js
@@ -0,0 +1,57 @@
+'use strict';
+
+const uuidv4 = require('uuid/v4');
+const createError = require('http-errors');
+const debug = require('debug')('pokemon:pokemon');
+const storage = require('../lib/storage.js');
+
+const Pokemon = module.exports = function(name, type, gen) {
+  if(!name) return Promise.reject(createError(400, 'expected name'));
+  if(!type) return Promise.reject(createError(400, 'expected type'));
+  if(!gen) return Promise.reject(createError(400, 'expected gen'));
+
+  this.id = uuidv4();
+  this.name = name;
+  this.type = type;
+  this.gen = gen;
+};
+
+Pokemon.createPokemon = function(_pokemon) {
+  debug('createPokemon');
+
+  try {
+    let pokemon = new Pokemon(_pokemon.name, _pokemon.type, _pokemon.gen);
+    return storage.createItem('pokemon', pokemon);
+  } catch(err) {
+    return Promise.reject(err);
+  }
+};
+
+Pokemon.fetchPokemon = function(id) {
+  debug('fetchPokemon');
+  return storage.fetchItem('pokemon', id);
+};
+
+Pokemon.updatePokemon = function(id, _pokemon) {
+  debug('update pokemon');
+
+  return storage.fetchItem('pokemon', id)
+  .catch( err=> Promise.reject(createError(404, err.message)))
+  .then (pokemon => {
+    for (var prop in pokemon) {
+      if(prop === 'id')continue;
+      if (_pokemon[prop]) pokemon[prop] = _pokemon[prop];
+    }
+    return storage.createItem('pokemon', pokemon);
+  });
+};
+
+Pokemon.deletePokemon = function(id) {
+  debug('deletePokemon');
+  return storage.deleteItem('pokemon', id);
+};
+
+Pokemon.fetchIDs = function() {
+  debug('fetchIDs');
+  return storage.availIDs('pokemon');
+};
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..8406fb6
--- /dev/null
+++ b/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "12-express-middleware",
+  "version": "1.0.0",
+  "description": "![cf](https://i.imgur.com/7v5ASc8.png) 12: Express Middleware ======",
+  "main": "server.js",
+  "directories": {
+    "test": "test"
+  },
+  "scripts": {
+    "test": "DEBUG='pokemon*' ./node_modules/mocha/bin/mocha",
+    "start": "DEBUG='pokemon*' node server.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Loaye/12-express-middleware.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/Loaye/12-express-middleware/issues"
+  },
+  "homepage": "https://github.com/Loaye/12-express-middleware#readme",
+  "dependencies": {
+    "bluebird": "^3.5.0",
+    "body-parser": "^1.17.2",
+    "debug": "^2.6.8",
+    "express": "^4.15.3",
+    "http-errors": "^1.6.1",
+    "morgan": "^1.8.2",
+    "uuid": "^3.1.0"
+  },
+  "devDependencies": {
+    "chai": "^4.1.0",
+    "mocha": "^3.5.0",
+    "superagent": "^3.5.2"
+  }
+}
diff --git a/route/pokemon-router.js b/route/pokemon-router.js
new file mode 100644
index 0000000..60a458d
--- /dev/null
+++ b/route/pokemon-router.js
@@ -0,0 +1,41 @@
+'use strict';
+
+const Router = require('express').Router;
+const jsonParser = require('body-parser').json();
+const debug = require('debug')('pokemon:pokemon-route');
+const Pokemon = require('../model/pokemon.js');
+const pokemonRouter = new Router();
+
+pokemonRouter.post('/api/pokemon', jsonParser, function(req,res,next) {
+  debug('POST: /api/pokemon');
+
+  Pokemon.createPokemon(req.body)
+  .then(pokemon => res.json(pokemon))
+  .catch(err => next(err));
+});
+
+pokemonRouter.get('/api/pokemon/:id', function(req,res,next ) {
+  debug('GET: /api/pokemon:id');
+
+  Pokemon.fetchPokemon(req.params.id)
+  .then(pokemon => res.json(pokemon))
+  .catch(err=> next(err));
+});
+
+pokemonRouter.get('/api/pokemon', function(req, res, next) {
+  debug('GET /api/pokemon');
+
+  Pokemon.fetchIDs()
+  .then(ids => res.json(ids))
+  .catch(err => next(err));
+});
+
+pokemonRouter.put('/api/pokemon', jsonParser, function(req, res, next) {
+  debug('PUT: /api/pokemon');
+
+  Pokemon.updatePokemon(req.query.id,req.body)
+  .then(pokemon => res.json(pokemon))
+  .catch(err => next(err));
+});
+
+module.exports = pokemonRouter;
\ No newline at end of file
diff --git a/server.js b/server.js
new file mode 100644
index 0000000..1395cfc
--- /dev/null
+++ b/server.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const morgan = require('morgan');
+const express = require('express');
+const createError = require('http-errors');
+const debug = require('debug')('pokemon:server');
+
+const pokemonRouter = require('./route/pokemon-router.js');
+const cors = require('./lib/cors-middleware.js');
+const errors = require('./lib/error-middleware.js');
+
+const PORT = process.env.PORT || 3000;
+const app = express();
+
+app.use(morgan('dev'));
+app.use(cors);
+app.use(pokemonRouter);
+app.use(errors); //always the last middleware
+
+app.listen(PORT, () => {
+  console.log(`server up: ${PORT}`);
+});
\ No newline at end of file
diff --git a/test/pokemon-route-test.js b/test/pokemon-route-test.js
new file mode 100644
index 0000000..6b9dcd3
--- /dev/null
+++ b/test/pokemon-route-test.js
@@ -0,0 +1,118 @@
+'use strict';
+
+const expect = require('chai').expect;
+const request = require('superagent');
+const Pokemon = require('../model/pokemon.js');
+const url = 'http://localhost:8000';
+
+require('../server.js');
+
+const examplePokemon = {
+  name: 'test name',
+  type: 'test type',
+  gen: 'test gen'
+};
+
+describe('pokemon routes', function() {
+  describe('GET: /api/pokemon', function(){
+    describe('with a valid id', function(){
+      before( done => {
+        Pokemon.createPokemon(examplePokemon)
+        .then(pokemon => {
+          this.tempPokemon = pokemon;
+          done();
+        })
+        .catch(err => done(err));
+      });
+
+      after(done => {
+        Pokemon.deletePokemon(this.tempPokemon.id)
+        .then(() => done())
+        .catch(err => done(err));
+      });
+
+      it('should return a pokemon', done => {
+        request.get(`${url}/api/pokemon/${this.tempPokemon.id}`)
+        .end((err, res) => {
+          if(err) return done(err);
+          expect(res.status).to.equal(200);
+          expect(res.body.id).to.equal(this.tempPokemon.id);
+          expect(res.body.name).to.equal(this.tempPokemon.name);
+          expect(res.body.location).to.equal(this.tempPokemon.location);
+          done();
+        });
+      });
+
+      describe('with an invalid id', function() {
+        it('shoulr respond witha 404', done => {
+          request.get(`${url}/api/pokemon/123456789`)
+          .end((err, res)=> {
+            expect(res.status).to.equal(404);
+            done();
+          });
+        });
+      });
+    });
+  });
+
+  describe('POST: /api/pokemon', function(){
+    describe('with a valid body', function(){
+      after(done => {
+        if(this.tempPokemon) {
+          Pokemon.deletePokemon(this.tempPokemon.id)
+          .then(() => done())
+          .catch(err=> done(err));
+        }
+      });
+
+      it('should return a pokemon', done =>{
+        request.post(`${url}/api/pokemon`)
+        .send(examplePokemon)
+        .end((err, res) => {
+          if (err) return done(err);
+          expect(res.status).to.equal(200);
+          expect(res.body.name).to.equal(examplePokemon.name);
+          expect(res.body.location).to.equal(examplePokemon.location);
+          this.tempPokemon = res.body;
+          done();
+        });
+      });
+    });
+  });
+
+  describe('PUT /api/pokemon', function(){
+    describe('with a valid id and body', function(){
+      before( done => {
+        Pokemon.createPokemon(examplePokemon)
+        .then(pokemon => {
+          this.tempPokemon = pokemon;
+          done();
+        })
+        .catch (err => done(err));
+      });
+
+      after(done => {
+        if (this.tempPokemon) {
+          Pokemon.deletePokemon(this.tempPokemon.id)
+          .then(()=> done())
+          .catch(done);
+        }
+      });
+
+      it('should return a pokemon', done =>{
+        let updatePokemon = {name: 'cubone', type: 'ground'};
+        request.put(`${url}/api/pokemon?id=${this.tempPokemon.id}`)
+        .send(updatePokemon)
+        .end((err, res)=> {
+          if (err)return done(err);
+          expect(res.status).to.equal(200);
+          expect(res.body.id).to.equal(this.tempPokemon.id);
+          for (var prop in updatePokemon){
+            expect(res.body[prop]).to.equal(updatePokemon[prop]);
+          }
+          done();
+        });
+      });
+    });
+  });
+});
\ No newline at end of file