diff --git a/quiz copy/index.js b/quiz copy/index.js
new file mode 100644
index 0000000..440ef30
--- /dev/null
+++ b/quiz copy/index.js	
@@ -0,0 +1 @@
+require('./src/server');
diff --git a/quiz copy/package.json b/quiz copy/package.json
new file mode 100644
index 0000000..d2473bf
--- /dev/null
+++ b/quiz copy/package.json	
@@ -0,0 +1,25 @@
+{
+  "name": "cl_project",
+  "version": "1.0.0",
+  "description": "This is a sample node project",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "code",
+    "louisville",
+    "sample",
+    "project"
+  ],
+  "author": "Aaron W. Johnson",
+  "license": "ISC",
+  "dependencies": {
+    "angular": "^1.6.1",
+    "body-parser": "^1.16.0",
+    "express": "^4.14.0",
+    "jquery": "^3.1.1",
+    "mongoose": "^4.8.4",
+    "pug": "^2.0.0-beta10"
+  }
+}
diff --git a/quiz copy/readme.md b/quiz copy/readme.md
new file mode 100644
index 0000000..99a0fa7
--- /dev/null
+++ b/quiz copy/readme.md	
@@ -0,0 +1,80 @@
+# FSJS Project Week 1
+
+## Install NodeJS
+
+- [Windows (http://blog.teamtreehouse.com/install-node-js-npm-windows)](http://blog.teamtreehouse.com/install-node-js-npm-windows)
+- [Mac (http://blog.teamtreehouse.com/install-node-js-npm-mac)](http://blog.teamtreehouse.com/install-node-js-npm-mac)
+- [Linux (http://blog.teamtreehouse.com/install-node-js-npm-linux)](http://blog.teamtreehouse.com/install-node-js-npm-linux)
+
+## Start a project
+Starting a project in node is simple:
+```
+mkdir my_awesome_project
+cd my_awesome_project
+npm init
+```
+
+`npm init` simply creates a `package.json` file a populates it with the answers to some questions.  You can edit it in a text editor.
+
+## Sample project organization
+When starting a project, a good practice is to lay out your directory structure and create some empty, basic files:
+```
+.
+├── index.js          // Entry point
+├── package.json
+└── src
+    ├── config        // application configuration
+    │   └── index.js
+    ├── models        // Database models
+    │   └── index.js
+    ├── routes        // HTTP(S) routing/controllers
+    │   └── index.js
+    └── server.js     // Set up server and listen on port
+```
+
+## Add a library
+Perhaps the primary use of `npm` is to add packages to your project.  We're going to add the 'E' of 'MEAN' to our project right now:
+
+```
+npm install express --save
+```
+
+This tells `npm` to download the 'express' package, save it in a newly created `node_modules` directory, and then add a line in `package.json` to make note of the fact that we need 'express' for this project (that's what the `--save` part does).
+
+## require() is a big deal
+Yes it is.  The full documentation for require() (really, for Node modules in general) can be found [here (https://nodejs.org/api/modules.html)](https://nodejs.org/api/modules.html).
+
+`require()` is what allows you to organize your code in to easy-to-understand (hopefully) directories and files, but join them all together in to a single application.
+
+For comparison: in a browser environment, if you want to make content from multiple file available to the larger application you can 1) concatenate them all in to one file or 2) load them individually via a `<script>` tag.  Then, the objects or functions in the file need to be made available by putting them in the global scope (which is `window` in a browser) or be added to some global object (like, say, `jQuery` via a plugin);
+
+`require()` serves that purpose on the server side by reading the contents of the file you specify, executing it, and making whatever you export available.
+```javascript
+// index.js
+var myRandomObject = require('./myFile');
+
+// myFile.js
+exports = {some: {random: ['object']}};
+```
+
+### What's with all these index.js files
+You will see (and create) a lot of `index.js` files in your Node lifetime.  The reason for this has to do with how `require()` behaves.
+
+When you pass the name of a directory to `require()`, it will specifically seek out a file in that directory named `index.js` (if it doesn't find one, it looks for index.node, but that's a story for another time)
+
+
+### So this can be confusing.
+Your text editor may have half a dozen open tabs - all with the name `index.js`. That's annoying, but the `index.js` naming convention is there for good reason and it is an important aspect of nodejs development.
+
+Remember, you don't HAVE to have an `index.js` file in a directory, but you should know how Node treats that file if you do.
+
+A couple of suggestions:
+- Learn to pay attention to the names of directories as much as you pay attention to the names of files
+- Add a comment at the top of the file that tells you where you are.  For example:
+```javascript
+// some/directory/index.js
+```
+or
+```javascript
+// yet/another/directory/index.js
+```
diff --git a/quiz/index.js b/quiz/index.js
new file mode 100644
index 0000000..440ef30
--- /dev/null
+++ b/quiz/index.js
@@ -0,0 +1 @@
+require('./src/server');
diff --git a/quiz/package.json b/quiz/package.json
new file mode 100644
index 0000000..d2473bf
--- /dev/null
+++ b/quiz/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "cl_project",
+  "version": "1.0.0",
+  "description": "This is a sample node project",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "code",
+    "louisville",
+    "sample",
+    "project"
+  ],
+  "author": "Aaron W. Johnson",
+  "license": "ISC",
+  "dependencies": {
+    "angular": "^1.6.1",
+    "body-parser": "^1.16.0",
+    "express": "^4.14.0",
+    "jquery": "^3.1.1",
+    "mongoose": "^4.8.4",
+    "pug": "^2.0.0-beta10"
+  }
+}
diff --git a/quiz/public/css/style.css b/quiz/public/css/style.css
new file mode 100644
index 0000000..4334dad
--- /dev/null
+++ b/quiz/public/css/style.css
@@ -0,0 +1,98 @@
+h1 {
+	color: green;
+}
+
+li {
+    cursor: pointer;
+}
+li.selected {
+    background-color: pink
+}
+
+*{
+	box-sizing: border-box; 
+}
+
+body, html{
+	font-family: 'Open Sans', sans-serif;
+	background: #fff;
+	padding: 0; 
+	margin: 0; 
+	font-size: 16px;
+}
+
+h1{
+	color: red; 
+}
+
+.wrapper{
+	background: #fff; 
+	max-width: 700px; 
+	margin: 0 auto; 
+	padding: 30px;
+}
+
+ul{
+	margin: 0 0 40px 0; padding: 0; overflow: auto;
+}
+
+li, label{
+	list-style-type: none;
+    padding: 20px;
+    width: 48%;
+    margin: 1%;
+    float: left;
+    text-align: center;
+    background-color: #efefef;
+    border: 1px solid #ccc;
+    min-height: 85px;
+}
+
+label{
+	 -webkit-box-flex: 1;
+    -moz-box-flex: 1;
+    -webkit-flex: 1;
+    -ms-flex: 1;
+    flex: 1;
+}
+
+.row {
+    display: -webkit-box;
+    display: -moz-box;
+    display: -webkit-flexbox;
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+}
+
+li:nth-child(odd), label:nth-child(odd){
+	margin-left:0%; 
+}
+
+label:hover{
+	cursor: pointer;
+}
+
+input:checked + label {
+    background: pink;
+}
+
+input[type=radio]{
+	display: none; 
+}
+
+button, input[type=submit]{
+	background: red; 
+	border: 0px; 
+	padding: 20px; 
+	color: #fff;
+	margin: 10px 0; 
+	font-size: 20px;
+	text-transform: uppercase;
+	font-family: 'Open Sans', sans-serif;
+}
+
+.question{
+	overflow: auto;
+	margin-bottom: 40px;
+}
\ No newline at end of file
diff --git a/quiz/public/js/component/file-list.component.js b/quiz/public/js/component/file-list.component.js
new file mode 100644
index 0000000..f20f5be
--- /dev/null
+++ b/quiz/public/js/component/file-list.component.js
@@ -0,0 +1,58 @@
+angular.module("fileList").component("fileList",{
+  templateUrl: "/js/template/file-list.template.html",
+  controller: function FileListController($http){
+    var self = this;
+/*
+    $http.get("/files").then(function(response){
+      self.files=response.data;
+    });
+*/	
+
+	this.getFiles = () => {
+	  return $http.get("/files").then(function(response){
+	    return self.files=response.data;
+	  });
+	}
+	this.getFiles();
+	    
+   this.selectFile = (file) => {
+	  // get the currently selected file and set the `selected`
+	  // property to false
+	  const currentlySelected = this.selectedFile;
+	  this.selectedFile = null;
+	
+	  // Mark the passed file as selected
+	  if (!currentlySelected || currentlySelected._id !== file._id) {
+	    this.selectedFile = angular.copy(file);
+	  }
+	}
+    
+    
+    //update file
+    this.updateFile = (file) => {
+
+	  $http.put(`/files/${file._id}`, {file})
+	    .then(response => {
+	      console.log("Successfully updated file");
+	      return this.getFiles();
+	    })
+	    .catch(err => {
+	      console.log("Oops...there was an error", err);
+	    })
+	}
+	
+	
+	// Delete a file
+	this.deleteFile = (file) => {
+	  $http.delete(`/files/${file._id}`)
+	    .then(response => {
+	      console.log("Successfully deleted file");
+	      this.selectedFile = null;
+	      return this.getFiles();
+	    })
+	    .catch(err => {
+	      console.log("Drat...there was an error", err);
+	    })
+	}	    
+  }
+});
diff --git a/quiz/public/js/module/app.module.js b/quiz/public/js/module/app.module.js
new file mode 100644
index 0000000..d13cf52
--- /dev/null
+++ b/quiz/public/js/module/app.module.js
@@ -0,0 +1 @@
+angular.module("fileListApp",["fileList"]);
diff --git a/quiz/public/js/module/file-list.module.js b/quiz/public/js/module/file-list.module.js
new file mode 100644
index 0000000..3248295
--- /dev/null
+++ b/quiz/public/js/module/file-list.module.js
@@ -0,0 +1 @@
+angular.module("fileList",[]);
diff --git a/quiz/public/js/template/file-list.template.html b/quiz/public/js/template/file-list.template.html
new file mode 100644
index 0000000..bdb7a62
--- /dev/null
+++ b/quiz/public/js/template/file-list.template.html
@@ -0,0 +1,38 @@
+
+<form action ="">
+<div class="question" ng-repeat="file in $ctrl.files">
+<h2>{{file.qname}}</h2>
+	<div class="row">
+	  <input type="radio" name="q{{$index + 1}}" value="1" id="q1{{$index + 1}}"> <label for="q1{{$index + 1}}">{{file.choose1}}</label>
+	  <input type="radio" name="q{{$index + 1}}" value="2" id="q2{{$index + 1}}"> <label for="q2{{$index + 1}}">{{file.choose2}}</label>
+	</div>
+	<div class="row">
+	  <input type="radio" name="q{{$index + 1}}" value="3" id="q3{{$index + 1}}"> <label for="q3{{$index + 1}}">{{file.choose3}}</label>
+	  <input type="radio" name="q{{$index + 1}}" value="4" id="q4{{$index + 1}}"> <label for="q4{{$index + 1}}">{{file.choose4}}</label>
+	</div>
+</div>
+<input type="Submit" value="Get Results">
+</form>
+<!-- public/js/template/file-list.template.html -->
+
+
+
+<!--
+<div ng-show="$ctrl.selectedFile">
+  <h4>Editing: {{$ctrl.selectedFile.title}}</h4>
+  <fieldset>
+    <div>
+      <label>Title: <input ng-model="$ctrl.selectedFile.title" /></label>
+    </div>
+    <div>
+      <label>Filename: <input ng-model="$ctrl.selectedFile.filename" /></label>
+    </div>
+    <div>
+      <button ng-click="$ctrl.updateFile($ctrl.selectedFile)">Update File</button>
+      <button ng-click="$ctrl.deleteFile($ctrl.selectedFile)">Delete</button>
+    </div>
+  </fieldset>
+</div>
+-->
+
+
diff --git a/quiz/public/puppy.jpg b/quiz/public/puppy.jpg
new file mode 100644
index 0000000..a36706e
Binary files /dev/null and b/quiz/public/puppy.jpg differ
diff --git a/quiz/readme.md b/quiz/readme.md
new file mode 100644
index 0000000..99a0fa7
--- /dev/null
+++ b/quiz/readme.md
@@ -0,0 +1,80 @@
+# FSJS Project Week 1
+
+## Install NodeJS
+
+- [Windows (http://blog.teamtreehouse.com/install-node-js-npm-windows)](http://blog.teamtreehouse.com/install-node-js-npm-windows)
+- [Mac (http://blog.teamtreehouse.com/install-node-js-npm-mac)](http://blog.teamtreehouse.com/install-node-js-npm-mac)
+- [Linux (http://blog.teamtreehouse.com/install-node-js-npm-linux)](http://blog.teamtreehouse.com/install-node-js-npm-linux)
+
+## Start a project
+Starting a project in node is simple:
+```
+mkdir my_awesome_project
+cd my_awesome_project
+npm init
+```
+
+`npm init` simply creates a `package.json` file a populates it with the answers to some questions.  You can edit it in a text editor.
+
+## Sample project organization
+When starting a project, a good practice is to lay out your directory structure and create some empty, basic files:
+```
+.
+├── index.js          // Entry point
+├── package.json
+└── src
+    ├── config        // application configuration
+    │   └── index.js
+    ├── models        // Database models
+    │   └── index.js
+    ├── routes        // HTTP(S) routing/controllers
+    │   └── index.js
+    └── server.js     // Set up server and listen on port
+```
+
+## Add a library
+Perhaps the primary use of `npm` is to add packages to your project.  We're going to add the 'E' of 'MEAN' to our project right now:
+
+```
+npm install express --save
+```
+
+This tells `npm` to download the 'express' package, save it in a newly created `node_modules` directory, and then add a line in `package.json` to make note of the fact that we need 'express' for this project (that's what the `--save` part does).
+
+## require() is a big deal
+Yes it is.  The full documentation for require() (really, for Node modules in general) can be found [here (https://nodejs.org/api/modules.html)](https://nodejs.org/api/modules.html).
+
+`require()` is what allows you to organize your code in to easy-to-understand (hopefully) directories and files, but join them all together in to a single application.
+
+For comparison: in a browser environment, if you want to make content from multiple file available to the larger application you can 1) concatenate them all in to one file or 2) load them individually via a `<script>` tag.  Then, the objects or functions in the file need to be made available by putting them in the global scope (which is `window` in a browser) or be added to some global object (like, say, `jQuery` via a plugin);
+
+`require()` serves that purpose on the server side by reading the contents of the file you specify, executing it, and making whatever you export available.
+```javascript
+// index.js
+var myRandomObject = require('./myFile');
+
+// myFile.js
+exports = {some: {random: ['object']}};
+```
+
+### What's with all these index.js files
+You will see (and create) a lot of `index.js` files in your Node lifetime.  The reason for this has to do with how `require()` behaves.
+
+When you pass the name of a directory to `require()`, it will specifically seek out a file in that directory named `index.js` (if it doesn't find one, it looks for index.node, but that's a story for another time)
+
+
+### So this can be confusing.
+Your text editor may have half a dozen open tabs - all with the name `index.js`. That's annoying, but the `index.js` naming convention is there for good reason and it is an important aspect of nodejs development.
+
+Remember, you don't HAVE to have an `index.js` file in a directory, but you should know how Node treats that file if you do.
+
+A couple of suggestions:
+- Learn to pay attention to the names of directories as much as you pay attention to the names of files
+- Add a comment at the top of the file that tells you where you are.  For example:
+```javascript
+// some/directory/index.js
+```
+or
+```javascript
+// yet/another/directory/index.js
+```
diff --git a/quiz/src/config/index.js b/quiz/src/config/index.js
new file mode 100644
index 0000000..946d17e
--- /dev/null
+++ b/quiz/src/config/index.js
@@ -0,0 +1,11 @@
+
+const config = {
+  appName: 'My awesome app',
+  port: 8080,
+  db: {
+    host: 'localhost',
+    dbName: 'quizQ',
+  }
+}
+
+module.exports = config;
diff --git a/quiz/src/models/.gitkeep b/quiz/src/models/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/quiz/src/models/file.model.js b/quiz/src/models/file.model.js
new file mode 100644
index 0000000..337a543
--- /dev/null
+++ b/quiz/src/models/file.model.js
@@ -0,0 +1,31 @@
+// Load mongoose package
+const mongoose = require('mongoose');
+
+const FileSchema = new mongoose.Schema({
+  qname: String,
+  choose1: String,
+  choose2: String,
+  choose3: String,
+  choose4: String,
+  updated_at: { type: Date, default: Date.now },
+});
+
+const File = mongoose.model('File', FileSchema);
+
+module.exports = File
+
+File.count({}, function(err, count) {
+  if (err) {
+    throw err;
+  }
+  // ...
+  if (count > 0) return;
+
+	const files = require('./file.seed.json');
+	File.create(files, function(err, newFiles) {
+		if (err) {
+			throw err;
+		}
+		console.log("DB seeded")
+	});
+});
\ No newline at end of file
diff --git a/quiz/src/models/file.seed.json b/quiz/src/models/file.seed.json
new file mode 100644
index 0000000..1817e24
--- /dev/null
+++ b/quiz/src/models/file.seed.json
@@ -0,0 +1,7 @@
+[
+  {"qname": "Choose a dessert", "choose1":"Ice Cream", "choose2":"Apple pie","choose3":"Cheesecake","choose4":"Chocolate cake"},
+  {"qname": "Pick your ideal dinner", "choose1":"Burger and fries", "choose2":"Pasta","choose3":"Filet mignon and potatoes","choose4":"Grilled fish and steamed vegetables"},
+  {"qname": "Choose your ideal vacation", "choose1":"Gambling in Vegas", "choose2":"Relaxing on the beach ","choose3":"Hiking in the mountains","choose4":"Trekking though a European city"},
+  {"qname": "Pick your favorite music genre", "choose1":"Country", "choose2":"R&B","choose3":"Classic Rock","choose4":"Classical"},
+  {"qname": "Choose your favorite type of cheese","choose1":"Cheddar", "choose2":"Parmesan","choose3":"Swiss","choose4":"Bleu"}
+]
\ No newline at end of file
diff --git a/quiz/src/routes/.gitkeep b/quiz/src/routes/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/quiz/src/routes/controllers/file.controller.js b/quiz/src/routes/controllers/file.controller.js
new file mode 100644
index 0000000..d64fb23
--- /dev/null
+++ b/quiz/src/routes/controllers/file.controller.js
@@ -0,0 +1,65 @@
+const mongoose = require('mongoose');
+
+module.exports = {
+	list:function(req,res,next){
+		mongoose.model('File').find({}, function(err, files) {
+		if (err) {
+		console.log(err);
+		res.status(500).json(err);
+		}
+		
+		res.json(files);
+		});
+	},
+	
+	//something else will go here
+	
+	// Update a file
+  update: function(req, res, next) {
+    const fileId = req.params.fileId;
+    const updatedFile = req.body.file;
+
+    mongoose.model('File').findById(fileId, function(err, file) {
+      if (err) {
+        console.log(err);
+        res.status(500).json(err);
+      }
+
+      file.title = updatedFile.title;
+      file.filename = updatedFile.filename;
+
+      file.save(function(err, file) {
+        if (err) {
+          console.log(err);
+          res.status(500).json(err);
+        }
+
+        res.json(file);
+      });
+    });
+  },
+  
+ // Delete a file
+  delete: function(req, res, next) {
+    const fileId = req.params.fileId;
+
+    mongoose.model('File').findById(fileId, function(err, file) {
+      if (err) {
+        console.log(err);
+        res.status(500).json(err);
+      }
+
+      file.remove(function(err, file) {
+        if (err) {
+          console.log(err);
+          res.status(500).json(err);
+        }
+
+        res.json(file);
+      })
+    })
+  }
+
+  
+  
+}
\ No newline at end of file
diff --git a/quiz/src/routes/index.js b/quiz/src/routes/index.js
new file mode 100644
index 0000000..b1ced62
--- /dev/null
+++ b/quiz/src/routes/index.js
@@ -0,0 +1,17 @@
+// src/routes/index.js
+const mongoose = require('mongoose');
+const router = require('express').Router();
+const fileController = require('./controllers/file.controller');
+
+module.exports = router;
+
+router.get('/files', fileController.list);
+router.put('/files/:fileId', fileController.update);
+router.delete('/files/:fileId', fileController.delete);
+
+router.get('/', (req,res) => {
+  res.render('index',
+    {title: 'Find out what wine suits your personality',
+    message: 'Wine Quiz'});
+});
+
diff --git a/quiz/src/server.js b/quiz/src/server.js
new file mode 100644
index 0000000..6b1df7b
--- /dev/null
+++ b/quiz/src/server.js
@@ -0,0 +1,28 @@
+// src/server.js
+const express    = require('express');
+const config     = require('./config');
+const router     = require('./routes');
+const bodyParser = require('body-parser');
+const path       = require('path');
+
+// Load mongoose package
+const mongoose = require('mongoose');
+
+// Connect to MongoDB and create/use database as configured
+mongoose.connect(`mongodb://${config.db.host}/${config.db.dbName}`);
+
+// Import all models
+require('./models/file.model.js');
+
+const app = express();
+app.use(bodyParser.json()); // for parsing application/json
+app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded
+app.set('view engine', 'pug');
+app.set('views', path.join(__dirname, 'views'));
+app.use(express.static(path.join(__dirname, '../public')));
+app.use('/node_modules',express.static(path.join(__dirname, '../node_modules')));
+app.use(router);
+
+app.listen(config.port, function() {
+  console.log("I AM LISTENING ON PORT " + config.port + "!!!");
+});
diff --git a/quiz/src/views/index.pug b/quiz/src/views/index.pug
new file mode 100644
index 0000000..7900c50
--- /dev/null
+++ b/quiz/src/views/index.pug
@@ -0,0 +1,15 @@
+doctype html
+html(ng-app="fileListApp")
+	head
+		link(rel="stylesheet", href="/css/style.css")
+		link(rel="stylesheet", href="https://fonts.googleapis.com/css?family=Open+Sans")
+		script(src="/node_modules/angular/angular.min.js")
+		script(src="/node_modules/jquery/dist/jquery.min.js")
+		title= title
+		script(src="/js/module/app.module.js")
+		script(src="/js/module/file-list.module.js")
+		script(src="/js/component/file-list.component.js")
+	body
+		div(class='wrapper')
+			h1= message
+			file-list
diff --git a/week2/package.json b/week2/package.json
index e4434f3..0473dd1 100644
--- a/week2/package.json
+++ b/week2/package.json
@@ -15,7 +15,10 @@
   "author": "Aaron W. Johnson",
   "license": "ISC",
   "dependencies": {
+    "angular": "^1.6.1",
     "body-parser": "^1.16.0",
-    "express": "^4.14.0"
+    "express": "^4.14.0",
+    "jquery": "^3.1.1",
+    "pug": "^2.0.0-beta10"
   }
 }
diff --git a/week2/public/best-kitten-names-1.jpg b/week2/public/best-kitten-names-1.jpg
new file mode 100644
index 0000000..5cbfa0e
Binary files /dev/null and b/week2/public/best-kitten-names-1.jpg differ
diff --git a/week2/public/css/style.css b/week2/public/css/style.css
new file mode 100644
index 0000000..3727786
--- /dev/null
+++ b/week2/public/css/style.css
@@ -0,0 +1,3 @@
+h1{
+	color: red; 
+}
\ No newline at end of file
diff --git a/week2/src/routes/index.js b/week2/src/routes/index.js
index d66c82e..b75ee2d 100644
--- a/week2/src/routes/index.js
+++ b/week2/src/routes/index.js
@@ -62,6 +62,9 @@ router.post('/files', function(req, res, next) {
 //   res.json(myData);
 // });
 
+router.get('/', function(req, res){
+	res.render('index', {title: 'My template', message: 'Hey wassssup'} )
+});
 
 router.use(function(req, res, next) {
   res.format({
diff --git a/week2/src/server.js b/week2/src/server.js
index 0452af4..c59d4bb 100644
--- a/week2/src/server.js
+++ b/week2/src/server.js
@@ -3,12 +3,19 @@ const express    = require('express');
 const config     = require('./config');
 const router     = require('./routes');
 const bodyParser = require('body-parser');
+const path = require('path'); 
 
 const app = express();
 app.use(bodyParser.json()); // for parsing application/json
 app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded
+app.set('views', path.join(__dirname, 'views'));
+app.set('view engine', 'pug');
+app.use(express.static(path.join(__dirname, '../public')));
+app.use('/node_modules', express.static(path.join(__dirname, '../node_modules')));
 app.use(router);
 
 app.listen(config.port, function() {
   console.log("I AM LISTENING ON PORT " + config.port + "!!!");
 });
+
+
diff --git a/week2/src/views/index.pug b/week2/src/views/index.pug
new file mode 100644
index 0000000..9852203
--- /dev/null
+++ b/week2/src/views/index.pug
@@ -0,0 +1,8 @@
+html
+	head
+		link(rel='stylesheet', href='/css/style.css')
+		script(src='/node_modules/angular/angular.js')
+		script(src='/node_modules/jquery/dist/jquery.js')
+		title= title
+	body
+		h1= message
\ No newline at end of file
diff --git a/week5/readme.md b/week5/readme.md
index 70f2650..99a0fa7 100644
--- a/week5/readme.md
+++ b/week5/readme.md
@@ -1,168 +1,80 @@
-# FSJS Week 5 - Mongo!!!!
-
-**Outline**
-
-2. Install Mongo (Go ahead and start on this)
-1. Set up for week5
-3. Create a model and seed it with data
-4. Connect Mongo to our application
-
-## 1. Install Mongo
-**Windows**:  https://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows/
-
-**Linux**
- https://docs.mongodb.com/manual/administration/install-on-linux/
-
-**OSX**
- https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x/
-
-
-## 2. Setup Project
-1. Get the latest version of the group project
-    ```
-    git clone https://github.com/CodeLouisville/FSJS-class-project.git
-    ```
-
-    or if you already have a clone repository
-    ```
-    git pull
-    ```
-
-1. Remove `week5` (because we are going to recreate it today) and copy `week4` to `week5`
-    ```
-    rm -rf week5
-    cp -r week4 week5
-    cd week5
-    ```
-
-3. Install packages
-    ```
-    npm install
-    ```
-
-4. Install mongoose
-    ```
-    npm install mongoose --save
-    ```
-    **Mongoose Documentation:** http://mongoosejs.com/docs/api.html
-
-5. Start application
-    ```
-    node index.js
-    ```
-
-
-## Create a model
-
-### Configure our app to work with mongo
-1. Edit our config file (at `src/config/index.js`) so that the returned configuration object includes mongo configuration:
-    ```javascript
-    const config = {
-      appName: 'My awesome app',
-      port: 8080,
-      db: {
-        host: 'localhost',
-        dbName: 'fsjs',
-      }
-    };
-    ```
-
-2. Connect to mongo through the mongoose library.  In `src/server.js`, import mongoose with
-    ```javascript
-    // Load mongoose package
-    const mongoose = require('mongoose');
-    ```
-    Then, connect with the following
-    ```javascript
-    // Connect to MongoDB and create/use database as configured
-    mongoose.connect(`mongodb://${config.db.host}/${config.db.dbName}`);
-    ```
-
-
-### Build the model
-
-1. In the `src/models` directory, create an empty file called `file.model.js`
-2. Within that file, pull in mongoose
-    ```javascript
-    // Load mongoose package
-    const mongoose = require('mongoose');
-    ```
-    
-3. Create a schema
-    ```javascript
-    const FileSchema = new mongoose.Schema({
-      filename: String,
-      title: String,
-      updated_at: { type: Date, default: Date.now },
-    });
-    ```
-    
-4. Turn that schema in to a mongoose model, register it, and export it
-    ```javascript
-    const File = mongoose.model('File', FileSchema);
-    module.exports = File
-    ```
-    
-5. Make sure that the `file.model.js` script is run by `require`-ing it somewhere...like in `src/server.js`
-    ```javascript
-    // Import all models
-    require('./models/file.model.js');
-    ```
-
-## Connect to our app
-1. In `src/routes.index.js`, pull in mongoose at the top of the file.
-    ```javascript
-    const mongoose = require('mongoose');
-    ```
-    
-2. Edit the `GET /files` route.  Replace our development code with
-    ```javascript
-    mongoose.model('File').find({}, function(err, files) {
-      if (err) {
-        console.log(err);
-        res.status(500).json(err);
-      }
-
-      res.json(files);
-    });
-    ```
-    **Model.find:** http://mongoosejs.com/docs/api.html#model_Model.find
-
-3. Restart server and test
-
-### What about some test data?
-Strategy: On startup, check if there are any files in the database, if not, then add files from a seed file.
-
-1. Create a file in `/src/models` called `file.seed.json`
-    ```json
-    [
-      {"filename": "file1.jpg", "title":"Mongo file 1"},
-      {"filename": "file2.jpg", "title":"Mongo file 2"},
-      {"filename": "file3.jpg", "title":"Mongo file 3"}
-    ]
-    ```
-
-2. In `file.model.js`, get the current count of documents in the collection
-    ```javascript
-    File.count({}, function(err, count) {
-      if (err) {
-        throw err;
-      }
-      // ...
-    });
-    ```
-    **Model.count:** http://mongoosejs.com/docs/api.html#model_Model.count
-
-3. Add the seed data
-    ```javascript
-    if (count > 0) return ;
-    
-    const files = require('./file.seed.json');
-    File.create(files, function(err, newFiles) {
-      if (err) {
-        throw err;
-      }
-      console.log("DB seeded")
-    });
-    ```
-    **Model.create:** http://mongoosejs.com/docs/api.html#model_Model.create
+# FSJS Project Week 1
+
+## Install NodeJS
+
+- [Windows (http://blog.teamtreehouse.com/install-node-js-npm-windows)](http://blog.teamtreehouse.com/install-node-js-npm-windows)
+- [Mac (http://blog.teamtreehouse.com/install-node-js-npm-mac)](http://blog.teamtreehouse.com/install-node-js-npm-mac)
+- [Linux (http://blog.teamtreehouse.com/install-node-js-npm-linux)](http://blog.teamtreehouse.com/install-node-js-npm-linux)
+
+## Start a project
+Starting a project in node is simple:
+```
+mkdir my_awesome_project
+cd my_awesome_project
+npm init
+```
+
+`npm init` simply creates a `package.json` file a populates it with the answers to some questions.  You can edit it in a text editor.
+
+## Sample project organization
+When starting a project, a good practice is to lay out your directory structure and create some empty, basic files:
+```
+.
+├── index.js          // Entry point
+├── package.json
+└── src
+    ├── config        // application configuration
+    │   └── index.js
+    ├── models        // Database models
+    │   └── index.js
+    ├── routes        // HTTP(S) routing/controllers
+    │   └── index.js
+    └── server.js     // Set up server and listen on port
+```
+
+## Add a library
+Perhaps the primary use of `npm` is to add packages to your project.  We're going to add the 'E' of 'MEAN' to our project right now:
+
+```
+npm install express --save
+```
+
+This tells `npm` to download the 'express' package, save it in a newly created `node_modules` directory, and then add a line in `package.json` to make note of the fact that we need 'express' for this project (that's what the `--save` part does).
+
+## require() is a big deal
+Yes it is.  The full documentation for require() (really, for Node modules in general) can be found [here (https://nodejs.org/api/modules.html)](https://nodejs.org/api/modules.html).
+
+`require()` is what allows you to organize your code in to easy-to-understand (hopefully) directories and files, but join them all together in to a single application.
+
+For comparison: in a browser environment, if you want to make content from multiple file available to the larger application you can 1) concatenate them all in to one file or 2) load them individually via a `<script>` tag.  Then, the objects or functions in the file need to be made available by putting them in the global scope (which is `window` in a browser) or be added to some global object (like, say, `jQuery` via a plugin);
+
+`require()` serves that purpose on the server side by reading the contents of the file you specify, executing it, and making whatever you export available.
+```javascript
+// index.js
+var myRandomObject = require('./myFile');
+
+// myFile.js
+exports = {some: {random: ['object']}};
+```
+
+### What's with all these index.js files
+You will see (and create) a lot of `index.js` files in your Node lifetime.  The reason for this has to do with how `require()` behaves.
+
+When you pass the name of a directory to `require()`, it will specifically seek out a file in that directory named `index.js` (if it doesn't find one, it looks for index.node, but that's a story for another time)
+
+
+### So this can be confusing.
+Your text editor may have half a dozen open tabs - all with the name `index.js`. That's annoying, but the `index.js` naming convention is there for good reason and it is an important aspect of nodejs development.
+
+Remember, you don't HAVE to have an `index.js` file in a directory, but you should know how Node treats that file if you do.
+
+A couple of suggestions:
+- Learn to pay attention to the names of directories as much as you pay attention to the names of files
+- Add a comment at the top of the file that tells you where you are.  For example:
+```javascript
+// some/directory/index.js
+```
+or
+```javascript
+// yet/another/directory/index.js
+```
diff --git a/week5/src/config/index.js b/week5/src/config/index.js
index 1a0c4a3..0aac7e9 100644
--- a/week5/src/config/index.js
+++ b/week5/src/config/index.js
@@ -4,7 +4,7 @@ const config = {
   port: 8080,
   db: {
     host: 'localhost',
-    dbName: 'fsjs'
+    dbName: 'fsjs',
   }
 }
 
diff --git a/week5/src/models/file.model.js b/week5/src/models/file.model.js
index 52ad4cc..9d63ca2 100644
--- a/week5/src/models/file.model.js
+++ b/week5/src/models/file.model.js
@@ -1,3 +1,4 @@
+// Load mongoose package
 const mongoose = require('mongoose');
 
 const FileSchema = new mongoose.Schema({
@@ -8,11 +9,16 @@ const FileSchema = new mongoose.Schema({
 
 const File = mongoose.model('File', FileSchema);
 
-// Seed the database if empty
+module.exports = File
+
 File.count({}, function(err, count) {
   if (err) {
     throw err;
   }
+<<<<<<< HEAD
+  // ...
+  if (count > 0) return ;
+=======
   
   if (count > 0) return;
   
@@ -23,5 +29,13 @@ File.count({}, function(err, count) {
     }
   });
 });
+>>>>>>> upstream/master
 
-module.exports = File
+	const files = require('./file.seed.json');
+	File.create(files, function(err, newFiles) {
+		if (err) {
+			throw err;
+		}
+		console.log("DB seeded")
+	});
+});
\ No newline at end of file
diff --git a/week5/src/models/file.seed.json b/week5/src/models/file.seed.json
index ebca078..caafd48 100644
--- a/week5/src/models/file.seed.json
+++ b/week5/src/models/file.seed.json
@@ -2,4 +2,4 @@
   {"filename": "file1.jpg", "title":"Mongo file 1"},
   {"filename": "file2.jpg", "title":"Mongo file 2"},
   {"filename": "file3.jpg", "title":"Mongo file 3"}
-]
+]
\ No newline at end of file
diff --git a/week5/src/routes/index.js b/week5/src/routes/index.js
index 41eae83..5cce77b 100644
--- a/week5/src/routes/index.js
+++ b/week5/src/routes/index.js
@@ -25,14 +25,14 @@ router.get('/tester', function(req, res, next) {
 
 
 router.get('/files', function(req, res, next) {
-  mongoose.model('File').find(function(err, files) {
-    if (err) {
-      console.log(err);
-      res.status(500).json(err);
-    }
-
-    res.json(files);
-  });
+  mongoose.model('File').find({}, function(err, files) {
+	if (err) {
+	console.log(err);
+	res.status(500).json(err);
+	}
+	
+	res.json(files);
+	});
 });
 
 router.post('/files', function(req, res, next) {
@@ -73,7 +73,7 @@ router.post('/files', function(req, res, next) {
 router.get('/', (req,res) => {
   res.render('index',
     {title: 'This is the title',
-    message: 'We survived week 3'});
+    message: 'We survived week 4'});
 });
 
 router.use(function(req, res, next) {
diff --git a/week5/src/server.js b/week5/src/server.js
index 1c1d190..6b1df7b 100644
--- a/week5/src/server.js
+++ b/week5/src/server.js
@@ -4,8 +4,9 @@ const config     = require('./config');
 const router     = require('./routes');
 const bodyParser = require('body-parser');
 const path       = require('path');
+
 // Load mongoose package
-const mongoose   = require('mongoose');
+const mongoose = require('mongoose');
 
 // Connect to MongoDB and create/use database as configured
 mongoose.connect(`mongodb://${config.db.host}/${config.db.dbName}`);
@@ -13,7 +14,6 @@ mongoose.connect(`mongodb://${config.db.host}/${config.db.dbName}`);
 // Import all models
 require('./models/file.model.js');
 
-
 const app = express();
 app.use(bodyParser.json()); // for parsing application/json
 app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded