diff --git a/.eslintrc.json b/.eslintrc.json
index 47e97bdb..3fb6a540 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -57,7 +57,6 @@
     "semi": [1, "never"],
     "space-before-blocks": ["error", { "functions": "always", "keywords": "always", "classes": "always" }],
     "space-before-function-paren": [2, "never"],
-    "strict": [2, "global"],
     "yoda": 2
 	},
 	"overrides": [{
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5c075a55..2253084f 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,6 +2,12 @@
 {
 	"version": "0.2.0",
 	"configurations": [
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Launch Current Opened File",
+			"program": "${file}"
+	},
 		{
 			"type": "node",
 			"request": "launch",
diff --git a/01 Setup.md b/01 Setup.md
index 6b139c2a..a1a4e284 100644
--- a/01 Setup.md	
+++ b/01 Setup.md	
@@ -13,6 +13,37 @@ Press CTRL-SHIFT-P and a selection box should appear at the top of the editor. T
 
 Now the integrated terminal uses the _Bash Shell_ meaning you can use the standard *nix bash commands!
 
+# If _Bash Shell_ is _not_ listed on your Windows 10 machine
+
+On some versions of Windows 10, some extra configuration is required before Bash Shell is able to be selected within VS Code. If this is the case on your machine, follow the below troubleshooting steps before reattempting to change your shell as above.
+
+To start, we need to make sure Developer Mode is enabled in the Update and Security section of Windows 10. Press **WIN+R** (Windows Key and R simultaneosly) to open a Run dialog. In the dialog enter **ms-settings:developers** followed by the enter key. The window shown below should appear on screen.
+
+![Enabling Windows 10 Developer Mode](exercises/.images/developerMode.PNG)
+
+Select the **Developer mode** radio button and **yes** on any succeeding dialog boxes. Wait for any neccessary installations to complete.
+
+Once that has completed, we need to enable the WSL (Windows Subsystem for Linux). Press **WIN+R**, in the dialog enter **powershell** followed by the enter key. In the powershell window copy and paste the following:
+
+```
+Start-Process powershell -Verb runAs
+exit
+```
+
+Press the enter key and accept the UAC (User Account Control) dialog. A new powershell window will launch with Administrator rights. 
+
+Copy and paste the following:
+
+```
+Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux
+```
+
+Press the enter key and wait for the process to complete. Once complete, restart your computer before continuing. 
+
+Finally, we need to install [Ubuntu from the Microsoft Store](https://www.microsoft.com/en-gb/p/ubuntu/9nblggh4msv6?activetab=pivot:overviewtab). Click the blue **Get** button and accept any dialogs to launch the Microsoft Store and begin the installation. Once Ubuntu for WSL (Windows Subsystem for Linux) has installed, restart Windows. 
+
+Once restarted, reattempt to enable Bash Shell in VS Code as per the section above. 
+
 ## 1 Forking the Foundation Materials
 
 You should start by logging in to the University GitHub server using your university username and password. Make sure you don't log into GitHub.com!
diff --git a/02 HTTP.md b/02 HTTP.md
index 80943f2b..338c6333 100644
--- a/02 HTTP.md	
+++ b/02 HTTP.md	
@@ -85,7 +85,7 @@ Start the server and access the `/books/1` route. What is displayed in the web b
 	2. Note that it is itself a JavaScript object and that it contains a single property called `index` which matches the name of the URL segment.
 	3. The value of this property is the string we added to the URL.
 4. This index value is used to look up the title of the book in the array, the book title is stored in a constant.
-5. Finally the book title is send to the web browser.
+5. Finally the book title is sent to the web browser.
 
 #### 1.3.1 Core Knowledge
 
@@ -178,7 +178,7 @@ Make sure the server is still running and use the [Chrome web browser](https://w
 1. Open the [Chrome Developer Tools](https://developers.google.com/web/tools/chrome-devtools/) by clicking on the _customise and control Google Chrome tools_ button (the three dots to the extreme right of the address bar).
 2. Choose **More tools** from the menu and then **Developer tools** from the submenu.
 3. Locate the **Network** tab in the Chrome developer tools.
-4. Reload the web page.
+4. Reload the web page. (Press F5)
 5. You should now see the resource sent in the HTTP response together with some data dealing with response times.
 6. Click on the file name (as shown) to display the HTTP headers.
 
diff --git a/03 HTML5.md b/03 HTML5.md
index d05d8c91..26d6eda5 100644
--- a/03 HTML5.md	
+++ b/03 HTML5.md	
@@ -213,7 +213,7 @@ Now we will learn how to embed audio in a website. There are a number of resourc
 
 1. Add the `guitar` audio file to the `index.html` web page. The file has been provided in the two required formats.
     1. Test that the audio plays in both Firefox and Chrome.
-    2. Can you modify the `<audio>` element to make the video auto-play?
+    2. Can you modify the `<audio>` element to make the sound auto-play?
 2. Add the `coventry` video clip to the `index.html` file, again the file has been provided in both formats (note that you will need to change one of the extensions from `.mp5` to `.mp4`).
     1. Test the video using both Firefox and Chrome.
     2. Restrict the video window to 320px wide without stretching the image.
@@ -250,7 +250,7 @@ Verify that you understand the elements used in marking up the table:
 
 ## 5 Semantic Markup
 
-In this final exercise we will look at how [MicroData](https://developer.mozilla.org/en-US/docs/Web/HTML/Microdata) can be used to add semantic information to a web page. Start by using the SSH Terminal to run the server in the `exercises/03_html/06_semantic/` directory and navigating to the base route `/`. This should display a simple review page.
+In this final exercise we will look at how [MicroData](https://developer.mozilla.org/en-US/docs/Web/HTML/Microdata) can be used to add semantic information to a web page. Start by using the SSH Terminal to run the server in the `exercises/03_html/05_semantic/` directory and navigating to the base route `/`. This should display a simple review page.
 
 1. Paste the URL into the [Rich Snippets Tool](http://www.google.com/webmasters/tools/richsnippets) to see what semantic data it contains. Notice:
     1. There are two **items** on in the webpage, a movie and a rating. These are defined using the `itemscope` attribute in the html. Each item has an `itemtype` attribute that points to the appropriate Microdata definition.
diff --git a/05 JavaScript.md b/05 JavaScript.md
index 0cf27839..a52e42fb 100644
--- a/05 JavaScript.md	
+++ b/05 JavaScript.md	
@@ -28,7 +28,7 @@ const biggest = largestNumber(5, 8)
 1. The function is declared using the `function` keyword and the function is given a name which must be a valid variable name.
     - If the name comprises more than one word these should be written using camel casing as shown above. This is known as a **Function Declaration**
 2. The function above takes two parameters, `a` and `b`.
-    - These are variables with local scope (they can't ba accessed outside the function)
+    - These are variables with local scope (they can't be accessed outside the function)
     - When the function is called, you need to pass two **values** which get assigned to the two parameters.
     - If you pass too many values the extra ones get _ignored_.
     - If you don't pass enough values the remainder are assigned a value of `null`. `Null` is an assignment value (means a value of no value).
@@ -98,8 +98,9 @@ const sqr = num => num * num
 1. Refactor the `remainder2` function expression to take advantage of the implicit return (you will need to reduce it to a single line of code).
 2. Compare this to the original version: which is more _readable_?
 3. Create a function expression that takes two string parameters and returns the longest string and assign this to a constant called `longest. check this works correctly.
-4. Modify the function expression so that it can handle any number of string parameters (use a _rest parameter_).
-5. Can you reduce this function expression to a single line (hint: explore using the [reduce function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/Reduce) combined with the [ternary operator](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Conditional_Operator))?
+4. Modify the function expression so that it can handle any number of string parameters (use a _rest parameter_). (hint: you will need to use a [`for...in`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for...in) statement to loop through the strings. How does this differ from a [`for...of`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for...of) statement?)
+5. Use a [ternary operator](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Conditional_Operator) instead of the `if` statement in the loop. 
+6. Finally use the [`reduce()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/Reduce) method to replace the `for...in` loop to reduce the function to a single line.
 
 ## 2 Callbacks
 
@@ -563,7 +564,7 @@ class Student extends Person {
 Currently each instance of a prototype function is completely self-contained. What if we need to store data about the prototype function itself? In a traditional OOP language we would use static methods and the new ECMA `class` syntax allows us to do something similar by adding properties to the prototype function itself. We can also define static methods that can be called directly from the prototype function, see the example below.
 
 ```javascript
-class Student {
+class ECMA6Student extends Person {
   constructor(name, startYear, course) {
 		super(name, startYear)
 		this.subject = course || 'not enrolled'
diff --git a/06 Code Quality.md b/06 Code Quality.md
index ca40be68..a65ca43d 100644
--- a/06 Code Quality.md	
+++ b/06 Code Quality.md	
@@ -10,43 +10,49 @@ In this worksheet you will be applying a range of techniques to improve the qual
 
 Before you start you need to pull any _upstream changes_. Detailed instructions can be found in the **Setup** lab.
 
-## 1 Modularisation
+## 1 The Package Manifest
 
-The first step you will need to do is to split your code up to make it easier to understand. Take a look at the end of the `index.js` routes file.
+Up until now you have needed to install each NodeJS package separately however most projects you will see from now onwards include a **package manifest** whick contains the project metadata. In a NodeJS project this file is named `package.json`. Locate the `06_code_quality/todo/` directory and open the `package.json` file it contains. This is a JSON file that contains a number of properties that are used by the application.
 
-Start by updating your routes file by copying over the `modules/accounts.js` file from the lab materials and making sure you import it into your `index.js` file by adding the following statement just below where all the other modules are imported:
+Locate the `dependencies` property, notice that this lists a number of packages that are needed by the application. Rather than install depndencies one by one we can tell the package manager to install all the packages listed here.
 
-```javascript
-const accounts = require('modules/accounts')
+```bash
+$ npm install
 ```
 
-This loads the module into a constant called `accounts`.
+Notice that this has installed all these listed packages. The manifest also specifies which version of each package are installed. If you want to install additional packages you can get these added to the `package.json` file automatically. For example if we want to install the `http-status-codes` package this should be done like this:
+
+```bash
+$ npm install --save http-status-codes
+```
+
+## 2 Modularisation
+
+Next you will need to do is to split your code up to make it easier to understand. Take a look at the `06_code_quality/todo/` project. If you run this you will see that it is a simple shopping list app where you can add multiple items and quantities. Currently all the functionality is contained in the `index.js` file. Locate the `modules/list.js` file. This declares a new Object Prototype called `List` which includes all the necessary functionality for the app. At the moment this is not being used by the app.
 
-Now locate the second `router.post('/login')` route (this is currently commented out). Comment out the one you have been using and uncomment this new shorter version. If you run your server and test it you will find the functionality is identical. Its time to understand how this new version works:
+Lets examine this module:
 
-1. We start by storing the `request.body` data (the HTTP POST request body data) in an immutable variable called `body`.
-2. Next we call the `checkCredentials()` function that we imported from the `accounts.js` module passing the username and password as parameters.
-3. If this function does not throw an exception it means the credentials are valid so we set the cookie and redirect to the home page.
-4. If either the username or password are invalid, the `checkCredentials()` function will throw an exception which will be handled by the `catch()` block. The error message will explain what us wrong so we pass this back to the login page.
+1. The `module.exports` object is used to define what functionality will be made available to our `index.js` file. In this case we are exporting the Object Prototype. Notice we are using the new `Class` constructor.
+2. Lines 6-8 are the constructor where we define our array that can be accessed by the object.
+3. The rest of the file defines a series of functions that form part of the object prototype.
 
-Now we need to look at the `accounts.js` module. This implements some very important concepts that you will need to understand and apply to your assignment.
+Now look at the top of the `index.js` file. Lines 22-23 import our module into the `List` variable. This can then be used to create a new object using our `List` object prototype. This object is called `list` and provides access to all the functionality defined in the object prototype. Foe example to add an item we can use:
 
-1. The `accounts` module contains two types of function:
-    1. The [function declarations](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function) such as `runSQL()` have a private scope and are not visible outside the module.
-    2. Any [function expressions](https://developer.mozilla.org/en-US/docs/web/JavaScript/Reference/Operators/function) stored as keys in the `module.exports` object such as `module.exports.checkCredentials` are available to any code that imports this module.
-2. All the code in a function is wrapped in a [try-catch](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/try...catch) block to handle any exceptions.
-3. The catch block simple propagates the [Error](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error) object to the calling code.
-4. Any non-valid code flow is handled by throwing an Error object which forces the code flow to jump directly to the catch block.
-5. This means that if the program flow reaches the end of the try block everything was successful and data can be returned.
+```javascript
+list.add('bread', 42)
+```
 
-### 1.1 Test Your Understanding
+This will call the `add()` function that is part of our `todo` object prototype.
 
-To check you understand how to use modules you are now expected to move more of the functionality from the `index.js` file into this separate module. To help you with this you will find stub functions that only require the functionality to be added! You will be modifying the functions below the `/* --- STUB FUNCTIONS --- */` line.
+### 2.1 Test Your Understanding
 
-1. Implement the `checkNoDuplicateUsername(username)` function to comply with the JSDoc comments, it should throw an exception if a duplicate user is found or `true` if not.
-2. Implement the `saveImage()` function. This should check that the image is of the correct type then save it to the `avatars/` directory.
-3. Now implement the `addUser()` function. This should make use of the functions you created in the first two tasks. It should check for duplicates before saving the image then it should encrypting the password and then saving the new record.
-4. The final step is to comment out the `router.post('register')` route in `index.js` then create a replacement that makes use of the functions you added to the `accounts.js` module.
+The custom object prototype defined in the `list.js` module already contains the functionality needed by your app. 
+
+1. Uncomment lines 22-23 to import the module and create a custom object.
+2. In the `router.post('/')` function call replace lines 41-42 with a call to `list.add()`, passing the item name and quantity as parameters.
+3. Now modify the `router.get('/')` function callback by replacing lines 29-30 with a call to the `list.getAll()` function.
+4. To test the functionality so far, comment out the array declaration on line 20 and try starting the web server. You should be able to add items, the data is now stored in the custom object.
+5. Finally replace line 53 with a call to the appropriate function in the custom object.
 
 Now much of the business logic has been moved to the separate module, are there any module imports in `index.js` that are no longer needed? Locate these and delete.
 
@@ -129,7 +135,16 @@ The callbacks are already nested 3 deep. To test your knowledge of deeply nested
 
 1. modify the script to ask for the currency to convert to and display only the one conversion rate.
 2. instead of printing the exchange rate, ask for the amount to be converted and them return the equivalent in the chosen currency
-3. use the [OpenExchangeRates](https://openexchangerates.org/api/currencies.json) API to display the full name of the chosen currency.
+3. The `currencies.json` file contains a map between the currency code and the country name. Load this file into the script using the [`fs`](https://nodejs.org/api/fs.html) module, convert to a JavaScript object using the [`JSON`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON) object and use it to display the full name of the chosen currency. Below is some code to get you started.
+
+You will need to import the `fs` module and use the `fs.readFile()` function which takes a callback!
+
+```javascript
+fs.readFile('currencies.json', 'utf8', (err, contents) => {
+    if(err) console.log('you need to handle this properly')
+    console.log(contents)
+})
+```
 
 Even though the script is still simple you are probably already getting in a tangle! Imagine a more complex script with conditions, it would quickly get out of hand and become practically impossible to debug.
 
@@ -149,6 +164,7 @@ A promise represents the result of an asynchronous operation. As such it can be
 
 Promises are created using the `new` keyword. This function is called immediately with two arguments. The first argument resolves the promise and the second one rejects it. Once the appropriate argument is called the promise state changes.
 ```javascript
+const url = 'https://api.exchangeratesapi.io/latest?base=GBP'
 const getData = url => new Promise( (resolve, reject) => {
   request(url, (err, res, body) => {
     if (err) reject(new Error('invalid API call'))
@@ -167,7 +183,7 @@ As you can see it it simple to wrap any async callbacks in promises but how are
 
 To use promises we need a mechanism that gets triggered as soon as a promise changes state. A promise includes a `then()` method which gets called if the state changes to _fulfilled_ and a `catch()` method that gets called if the state changes to _rejected_. 
 ```javascript
-const aPromise = getData('http://api.fixer.io/latest?base=GBP')
+const aPromise = getData('https://api.exchangeratesapi.io/latest?base=GBP')
 
 aPromise.then( data => console.log(data))
 
@@ -179,7 +195,7 @@ If the state of the promise changes to _rejected_, the `catch()` method is calle
 
 This code can be written in a more concise way by _chaining_ the promise methods.
 ```javascript
-getData('http://api.fixer.io/latest?base=GBP')
+getData('https://api.exchangeratesapi.io/latest?base=GBP')
   .then( data => console.log(data))
   .catch( err => console.error(`error: ${err.message}`))
 ```
@@ -208,7 +224,7 @@ const exit = () => new Promise( () => {
   process.exit()
 })
 
-getData('http://api.fixer.io/latest?base=GBP')
+getData('https://api.exchangeratesapi.io/latest?base=GBP')
   .then( data => printObject(data))
   .then( () => exit())
   .catch(err => console.error(`error: ${err.message}`))
@@ -223,7 +239,7 @@ Despite the code in the `printObject` promise being _synchronous_ it is better t
 If a promise only takes a single parameter and this matches the data passed back when the previous promise _fulfills_ there is a more concise way to write this.
 
 ```javascript
-getData('http://api.fixer.io/latest?base=GBP')
+getData('https://api.exchangeratesapi.io/latest?base=GBP')
   .then(printObject)
   .then(exit)
   .catch(err => console.error(`error: ${err.message}`))
@@ -232,25 +248,27 @@ getData('http://api.fixer.io/latest?base=GBP')
 
 
 There are some situations where you can't simply pass the output from one promise to the input of the next one. Sometimes you need to store data for use further down the promise chain. This can be achieved by storing the data in the `this` object.
+
 ```javascript
-getData('http://api.fixer.io/latest?base=GBP')
+getData('https://api.exchangeratesapi.io/latest?base=GBP')
   .then( data => this.jsonData = data)
   .then( () => printObject(this.jsonData))
   .then(exit)
   .catch(err => console.error(`error: ${err.message}`))
   .then(exit)
 ```
+
 In the example above we store the data returned from the `getData` promise in the `this` object. This is then used when we call the `printObject` promise.
 
 ### 6.4 Test Your Knowledge
 
-Run the `promises.js` script, its functionality should be familiar to the `currency.js` script you worked with in chapter 3.
+Run the `promises.js` script. Its functionality should be familiar to the `currency.js` script you worked with in chapter 3.
 
-Open the `promises.js` script and study the code carefully. Notice that it defines 5 promises and chains them together. You are going to extend the functionality by defining some additional promises and adding them to the promise chain.
+Study the code carefully. Notice that it defines 5 promises and chains them together. You are going to extend the functionality by defining some additional promises and adding them to the promise chain.
 
-1. modify the script to ask for the currency to convert to and display only the one conversion rate.
-2. instead of printing the exchange rate, ask for the amount to be converted and them return the equivalent in the chosen currency
-3. use the [OpenExchangeRates](https://openexchangerates.org/api/currencies.json) API to display the full name of the chosen currency
+1. Modify the script to ask for the currency to convert to and display only the one conversion rate.
+2. Instead of printing the exchange rate, ask for the amount to be converted and them return the equivalent in the chosen currency.
+3. The `currencies.json` file contains a map between the currency code and the country name. Load this file into the script using the [`fs`](https://nodejs.org/api/fs.html) module, convert to a JavaScript object using the [`JSON`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON) object and use it to display the full name of the chosen currency.
 
 ### 6.5 Executing Code Concurrently
 
@@ -273,7 +291,7 @@ const dataArray = ['USD', 'EUR']
 const promiseArray = []
 dataArray.forEach( curr => {
 	promiseArray.push(new Promise( (resolve, reject) => {
-		const url = `http://api.fixer.io/latest?base=GBP&symbols=${curr}`
+		const url = `https://api.exchangeratesapi.io/latest?base=GBP&symbols=${curr}`
 		request.get(url, (err, res, body) => {
 			if (err) reject(new Error(`could not get conversion rate for ${curr}`))
 			resolve(body)
@@ -339,7 +357,7 @@ const printObject = data => new Promise( resolve => {
 
 async function main() {
   try {
-    const data = await getData('http://api.fixer.io/latest?base=GBP')
+    const data = await getData('https://api.exchangeratesapi.io/latest?base=GBP')
     await printObject(data)
     process.exit()
   } catch (err) {
@@ -376,10 +394,10 @@ both `printObjectPromise` and `printObjectAsync` behave in exactly the same mann
 
 ### 7.3 Test Your Knowledge
 
-Run the `asyncFunctions.js` script. Note that it works in the same way as the previous ones. Open the script and study it carefully.
+Run the `asyncFunctions.js` script, located in the otherScripts folder. Note that it works in the same way as the previous ones. Open the script and study it carefully.
 
-1. modify the script to ask for the currency to convert to and display only the one conversion rate.
-2. instead of printing the exchange rate, ask for the amount to be converted and them return the equivalent in the chosen currency
-3. use the [OpenExchangeRates](https://openexchangerates.org/api/currencies.json) API to display the full name of the chosen currency
-4. rewrite the `printObject` promise as an _async function_.
-5. rewrite another promise as an _async function_.
+1. Modify the script to ask for the currency to convert to and display only the one conversion rate.
+2. Instead of printing the exchange rate, ask for the amount to be converted and them return the equivalent in the chosen currency
+3. The `currencies.json` file contains a map between the currency code and the country name. Load this file into the script using the [`fs`](https://nodejs.org/api/fs.html) module, convert to a JavaScript object using the [`JSON`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON) object and use it to display the full name of the chosen currency.
+4. Rewrite the `printObject` promise as an _async function_.
+5. Rewrite another promise as an _async function_.
diff --git a/07 Unit Testing.md b/07 Unit Testing.md
index be7530a9..6242a6e7 100644
--- a/07 Unit Testing.md	
+++ b/07 Unit Testing.md	
@@ -114,7 +114,7 @@ In the previous section you learned how to run a test suite and check code cover
 
 ### 1.5 Visual Studio Code Extensions
 
-One of the powerful features of VS Code is its support for **Extensions** which allow you to add additional capabilities to the editor.
+One of the powerful features of VS Code is its support for **Extensions** which allow you to add additional capabilities to the editor. Make sure you are running the _latest_ version of VS Code (1.38.1 at the time of writing).
 
 ![The Extensions Tab](exercises/.images/extensions_tab.png)
 
@@ -122,15 +122,24 @@ You should start by opening the tab and checking for the extensions already inst
 
 In this lab you will need:
 
-1. coverage-gutters
-2. jest
-3. test-explorer
+![Extensions](exercises/.images/extension_icons.png)
+
+1. Coverage Gutters
+2. Jest
+3. Jest Test Explorer
+4. Test Explorer UI
+
+Once installed you will need to _completely shutdown and restart_ the VS Code editor before continuing.
 
 ### 1.6 Running a Test Suite
 
-After reloading the editor you should see an additional tab, directly under the **Extensions** tab. This is called the **Test**  tab and has an icon that looks like a conical flask from your chemistry lesson.
+After restarting the editor you should see an additional tab, directly under the **Extensions** tab. This is called the **Test** tab and has an icon that looks like a conical flask from your chemistry lesson. This was added by the **Test Explorer** extension.
 
-If you open this tab you will see the **Test Explorer** which has a number of button along the top. The most prominent of these is the _play_ button. If you click this it will run the entire suite of tests in your project.
+If you open this tab you will see the **Test Explorer** which should eventually locate your unit test suites, run them and display them. The first time you will need to expand the tree nodes to see them. There are a number of button along the top. The most prominent of these is the _play_ button. If you click this it will run the entire suite of tests in your project.
+
+If the tests don't load, check at the bottom of the editor to see if Jest has stopped working. There are two main reasons this happens:
+1. If there is a space in the path to your project directory. If this happens, close down the editor, move the entire `foundation/` directory to a more suitable location and open the `todo/` directory again using VS Code.
+2. If you have opened the `foundation/` directory in VS Code instead of just the `todo/` directory.
 
 ![The Test Explorer](exercises/.images/test_explorer.png)
 
@@ -414,4 +423,6 @@ You will now complete a few more TDD iterations:
 4. Can you write one or more tests for the `getAll()` function?
 5. And for the `clear()` function as well.
 
+As before, are you gettting 100% code coverage? If not, write more tests. Are you covering the edge cases and checking for correct handling of bad data?
+
 Note that there appears to be a bug in the VS Code debugger when stepping through a function that returns a promise. If the debugger sends you to a script called `async_hooks.js` you can get stuck in an loop. When the debugger is highlighting the closing brace of an async function press the **Step Out** button a few times (typically) to return to the parent function. Remember you can add breakpoints to the test as well as the module code.
diff --git a/README.md b/README.md
index d1491473..d6c6e0da 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,11 @@ This teaching material covers the foundation skills required to understand the w
 
 The materials are split into several key topics:
 
-1. Understanding the HTTP protocol that underpins the world wide web.
-2. Learning about the latest version of the Hypertext Markup Language used to building structured content.
-3. Applying Cascading Stylesheets to change the appearance of web pages.
-4. Learning the foundations of the NodeJS programming language.
-5. Data persistence using a relational database.
+1. Learning how to install and configure the key development tools used in these labs.
+2. Understanding the HTTP protocol that underpins the world wide web.
+3. Learning about the latest version of the Hypertext Markup Language used to building structured content.
+4. Applying Cascading Stylesheets to change the appearance of web pages.
+5. Learning the foundations of the NodeJS programming language.
 6. Understanding a number of tools that can be used to improve the quality of the code you write.
 7. Writing automated unit tests using Jest.
 
@@ -19,23 +19,3 @@ Each topic should be worked through carefully and you should always complete the
 This Github repository is a collaborative work between Coventry University and Helsinki Metropolia University of Applied Sciences. The repository was initially set up by Mark Tyers who contributed initial drafts of most exercises. During the 1st semester of the 15-16 academic year, this set of material was used by Erja, Vesa and colleagues, who made substantial improvements.
 
 Additions were made by Jianhua Yang between 2016-17 after which the module was taken over by Mark Tyers for the 2018 delivery.
-
-Tagged releases have been created at the end of each semester of delivery to act as snapshots of the materials. These can be accessed in GitHub under the **Releases** tab.
-
-```shell
-$ git tag -a 1415OCTMAY 582f65c -m '1415OCTMAY'
-$ git push origin 1415OCTMAY
-```
-
-Deleting tags (local then remote).
-
-```shell
-$ git tag --delete 582f65c
-$ git push -delete origin 582f65c
-```
-
-Notes:
-
-Express vs Koa vs Hapi: https://www.sitepoint.com/express-koa-hapi/
-
-Good article on Koa covering useful bits such as global error handling: https://scotch.io/tutorials/introduction-to-koa-the-future-of-express
diff --git a/exercises/.images/developerMode.PNG b/exercises/.images/developerMode.PNG
new file mode 100644
index 00000000..e287f8c4
Binary files /dev/null and b/exercises/.images/developerMode.PNG differ
diff --git a/exercises/.images/extension_icons.png b/exercises/.images/extension_icons.png
new file mode 100644
index 00000000..ee926bd2
Binary files /dev/null and b/exercises/.images/extension_icons.png differ
diff --git a/exercises/06_code_quality/README.md b/exercises/06_code_quality/README.md
deleted file mode 100644
index 19df846d..00000000
--- a/exercises/06_code_quality/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Assignment Template
-
-This repository contains the base files for the assignment. To make use of this carry out the following steps:
-
-1. Fork this repository but change its name (replace `xxx` with your university username):
-    1. If this is your original assignment, `xxx-coursework`.
-    2. If this is your resit assignment code, `xxx-resit`.
-2. Replace the contents of this file with the details of the topic you have been assigned.
diff --git a/exercises/06_code_quality/asyncFunctions.js b/exercises/06_code_quality/asyncFunctions.js
new file mode 100644
index 00000000..35f1e2b4
--- /dev/null
+++ b/exercises/06_code_quality/asyncFunctions.js
@@ -0,0 +1,57 @@
+
+'use strict'
+
+const request = require('request')
+const readline = require('readline')
+
+const baseURL = 'https://api.exchangeratesapi.io/latest'
+
+async function main() {
+	try {
+		const base = await getInput('enter base currency')
+		await checkValidCurrencyCode(base)
+		const data = await getData(`${baseURL}?base=${base}`)
+		await printObject(data)
+		const to = await getInput('convert to')
+		console.log(to)
+		process.exit()
+	} catch (err) {
+		console.log(`error: ${err.message}`)
+	}
+}
+
+const getInput = prompt => new Promise(resolve => {
+	const read = readline.createInterface({ input: process.stdin, output: process.stdout })
+	read.question(`${prompt}: `, value => {
+		console.log(`You entered ${value}`)
+		read.close()
+		resolve(value)
+	})
+})
+
+const checkValidCurrencyCode = code => new Promise( (resolve, reject) => {
+	code = code.trim()
+	request(baseURL, (err, res, body) => {
+		if (err) reject(new Error('invalid API call'))
+		const rates = JSON.parse(body).rates
+		if (!rates.hasOwnProperty(code)) it.throw(new Error(`invalid currency code ${code}`))
+		resolve()
+	})
+})
+
+const getData = url => new Promise( (resolve, reject) => {
+	request(url, (err, res, body) => {
+		if (err) reject(new Error('invalid API call'))
+		resolve(body)
+	})
+})
+
+const printObject = data => new Promise( (resolve) => {
+	const indent = 2
+	data = JSON.parse(data)
+	const str = JSON.stringify(data, null, indent)
+	console.log(str)
+	resolve()
+})
+
+main()
diff --git a/exercises/06_code_quality/async_await.js b/exercises/06_code_quality/async_await.js
new file mode 100644
index 00000000..a49b9aea
--- /dev/null
+++ b/exercises/06_code_quality/async_await.js
@@ -0,0 +1,42 @@
+
+'use strict'
+
+const fs = require('fs')
+
+async function main() {
+	try {
+		await saveData1('hello world 1\n')
+		await saveData2('hello world 2\n')
+		await saveData3('hello world 3\n')
+		await saveData4('hello world 4\n')
+	} catch (err) {
+		console.log(err.message)
+	}
+}
+
+const saveData1 = function(data) {
+	return new Promise(function(resolve, reject) {
+		try {
+			fs.appendFileSync('data.txt', data)
+			resolve()
+		} catch(err) {
+			reject(err.message)
+		}
+	})
+}
+
+const saveData2 = data => new Promise( (resolve, reject) => {
+	try {
+		resolve(fs.appendFileSync('data.txt', data))
+	} catch(err) {
+		reject(err.message)
+	}
+})
+
+const saveData3 = async function(data) {
+	return fs.appendFileSync('data.txt', data)
+}
+
+const saveData4 = async data => fs.appendFileSync('data.txt', data)
+
+main()
diff --git a/exercises/06_code_quality/currencies.json b/exercises/06_code_quality/currencies.json
new file mode 100644
index 00000000..08407277
--- /dev/null
+++ b/exercises/06_code_quality/currencies.json
@@ -0,0 +1,173 @@
+{
+  "AED": "United Arab Emirates Dirham",
+  "AFN": "Afghan Afghani",
+  "ALL": "Albanian Lek",
+  "AMD": "Armenian Dram",
+  "ANG": "Netherlands Antillean Guilder",
+  "AOA": "Angolan Kwanza",
+  "ARS": "Argentine Peso",
+  "AUD": "Australian Dollar",
+  "AWG": "Aruban Florin",
+  "AZN": "Azerbaijani Manat",
+  "BAM": "Bosnia-Herzegovina Convertible Mark",
+  "BBD": "Barbadian Dollar",
+  "BDT": "Bangladeshi Taka",
+  "BGN": "Bulgarian Lev",
+  "BHD": "Bahraini Dinar",
+  "BIF": "Burundian Franc",
+  "BMD": "Bermudan Dollar",
+  "BND": "Brunei Dollar",
+  "BOB": "Bolivian Boliviano",
+  "BRL": "Brazilian Real",
+  "BSD": "Bahamian Dollar",
+  "BTC": "Bitcoin",
+  "BTN": "Bhutanese Ngultrum",
+  "BWP": "Botswanan Pula",
+  "BYN": "Belarusian Ruble",
+  "BZD": "Belize Dollar",
+  "CAD": "Canadian Dollar",
+  "CDF": "Congolese Franc",
+  "CHF": "Swiss Franc",
+  "CLF": "Chilean Unit of Account (UF)",
+  "CLP": "Chilean Peso",
+  "CNH": "Chinese Yuan (Offshore)",
+  "CNY": "Chinese Yuan",
+  "COP": "Colombian Peso",
+  "CRC": "Costa Rican Colón",
+  "CUC": "Cuban Convertible Peso",
+  "CUP": "Cuban Peso",
+  "CVE": "Cape Verdean Escudo",
+  "CZK": "Czech Republic Koruna",
+  "DJF": "Djiboutian Franc",
+  "DKK": "Danish Krone",
+  "DOP": "Dominican Peso",
+  "DZD": "Algerian Dinar",
+  "EGP": "Egyptian Pound",
+  "ERN": "Eritrean Nakfa",
+  "ETB": "Ethiopian Birr",
+  "EUR": "Euro",
+  "FJD": "Fijian Dollar",
+  "FKP": "Falkland Islands Pound",
+  "GBP": "British Pound Sterling",
+  "GEL": "Georgian Lari",
+  "GGP": "Guernsey Pound",
+  "GHS": "Ghanaian Cedi",
+  "GIP": "Gibraltar Pound",
+  "GMD": "Gambian Dalasi",
+  "GNF": "Guinean Franc",
+  "GTQ": "Guatemalan Quetzal",
+  "GYD": "Guyanaese Dollar",
+  "HKD": "Hong Kong Dollar",
+  "HNL": "Honduran Lempira",
+  "HRK": "Croatian Kuna",
+  "HTG": "Haitian Gourde",
+  "HUF": "Hungarian Forint",
+  "IDR": "Indonesian Rupiah",
+  "ILS": "Israeli New Sheqel",
+  "IMP": "Manx pound",
+  "INR": "Indian Rupee",
+  "IQD": "Iraqi Dinar",
+  "IRR": "Iranian Rial",
+  "ISK": "Icelandic Króna",
+  "JEP": "Jersey Pound",
+  "JMD": "Jamaican Dollar",
+  "JOD": "Jordanian Dinar",
+  "JPY": "Japanese Yen",
+  "KES": "Kenyan Shilling",
+  "KGS": "Kyrgystani Som",
+  "KHR": "Cambodian Riel",
+  "KMF": "Comorian Franc",
+  "KPW": "North Korean Won",
+  "KRW": "South Korean Won",
+  "KWD": "Kuwaiti Dinar",
+  "KYD": "Cayman Islands Dollar",
+  "KZT": "Kazakhstani Tenge",
+  "LAK": "Laotian Kip",
+  "LBP": "Lebanese Pound",
+  "LKR": "Sri Lankan Rupee",
+  "LRD": "Liberian Dollar",
+  "LSL": "Lesotho Loti",
+  "LYD": "Libyan Dinar",
+  "MAD": "Moroccan Dirham",
+  "MDL": "Moldovan Leu",
+  "MGA": "Malagasy Ariary",
+  "MKD": "Macedonian Denar",
+  "MMK": "Myanma Kyat",
+  "MNT": "Mongolian Tugrik",
+  "MOP": "Macanese Pataca",
+  "MRO": "Mauritanian Ouguiya (pre-2018)",
+  "MRU": "Mauritanian Ouguiya",
+  "MUR": "Mauritian Rupee",
+  "MVR": "Maldivian Rufiyaa",
+  "MWK": "Malawian Kwacha",
+  "MXN": "Mexican Peso",
+  "MYR": "Malaysian Ringgit",
+  "MZN": "Mozambican Metical",
+  "NAD": "Namibian Dollar",
+  "NGN": "Nigerian Naira",
+  "NIO": "Nicaraguan Córdoba",
+  "NOK": "Norwegian Krone",
+  "NPR": "Nepalese Rupee",
+  "NZD": "New Zealand Dollar",
+  "OMR": "Omani Rial",
+  "PAB": "Panamanian Balboa",
+  "PEN": "Peruvian Nuevo Sol",
+  "PGK": "Papua New Guinean Kina",
+  "PHP": "Philippine Peso",
+  "PKR": "Pakistani Rupee",
+  "PLN": "Polish Zloty",
+  "PYG": "Paraguayan Guarani",
+  "QAR": "Qatari Rial",
+  "RON": "Romanian Leu",
+  "RSD": "Serbian Dinar",
+  "RUB": "Russian Ruble",
+  "RWF": "Rwandan Franc",
+  "SAR": "Saudi Riyal",
+  "SBD": "Solomon Islands Dollar",
+  "SCR": "Seychellois Rupee",
+  "SDG": "Sudanese Pound",
+  "SEK": "Swedish Krona",
+  "SGD": "Singapore Dollar",
+  "SHP": "Saint Helena Pound",
+  "SLL": "Sierra Leonean Leone",
+  "SOS": "Somali Shilling",
+  "SRD": "Surinamese Dollar",
+  "SSP": "South Sudanese Pound",
+  "STD": "São Tomé and Príncipe Dobra (pre-2018)",
+  "STN": "São Tomé and Príncipe Dobra",
+  "SVC": "Salvadoran Colón",
+  "SYP": "Syrian Pound",
+  "SZL": "Swazi Lilangeni",
+  "THB": "Thai Baht",
+  "TJS": "Tajikistani Somoni",
+  "TMT": "Turkmenistani Manat",
+  "TND": "Tunisian Dinar",
+  "TOP": "Tongan Pa'anga",
+  "TRY": "Turkish Lira",
+  "TTD": "Trinidad and Tobago Dollar",
+  "TWD": "New Taiwan Dollar",
+  "TZS": "Tanzanian Shilling",
+  "UAH": "Ukrainian Hryvnia",
+  "UGX": "Ugandan Shilling",
+  "USD": "United States Dollar",
+  "UYU": "Uruguayan Peso",
+  "UZS": "Uzbekistan Som",
+  "VEF": "Venezuelan Bolívar Fuerte (Old)",
+  "VES": "Venezuelan Bolívar Soberano",
+  "VND": "Vietnamese Dong",
+  "VUV": "Vanuatu Vatu",
+  "WST": "Samoan Tala",
+  "XAF": "CFA Franc BEAC",
+  "XAG": "Silver Ounce",
+  "XAU": "Gold Ounce",
+  "XCD": "East Caribbean Dollar",
+  "XDR": "Special Drawing Rights",
+  "XOF": "CFA Franc BCEAO",
+  "XPD": "Palladium Ounce",
+  "XPF": "CFP Franc",
+  "XPT": "Platinum Ounce",
+  "YER": "Yemeni Rial",
+  "ZAR": "South African Rand",
+  "ZMW": "Zambian Kwacha",
+  "ZWL": "Zimbabwean Dollar"
+}
diff --git a/exercises/06_code_quality/list.js b/exercises/06_code_quality/list.js
new file mode 100644
index 00000000..69912d5b
--- /dev/null
+++ b/exercises/06_code_quality/list.js
@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const readline = require('readline-sync')
+const items = []
+let action
+
+while(true) {
+	action = String(readline.question('enter a command (add, list, quit): '))
+	switch(action) {
+		case 'add':
+			const item = String(readline.question('item name: '))
+			const qty = Number(readline.question(`now many items of type "${item}": `))
+			items.push({item, qty})
+		case 'list':
+			items.forEach( item => console.log(`${item.item}: ${item.qty}`))
+		case 'quit':
+			process.exit()
+		default:
+			console.log('command not recognised')
+	}
+}
diff --git a/exercises/06_code_quality/nestedCallbacks.js b/exercises/06_code_quality/nestedCallbacks.js
new file mode 100644
index 00000000..6d89b729
--- /dev/null
+++ b/exercises/06_code_quality/nestedCallbacks.js
@@ -0,0 +1,61 @@
+
+'use strict'
+
+const request = require('request')
+
+getInput('enter base currency', (err, base) => {
+	if (err) {
+		console.log(err.message)
+		process.exit()
+	}
+	base = base.trim()
+	checkValidCurrencyCode(base, err => {
+		if (err) {
+			console.log(err.message)
+			process.exit()
+		}
+		getData(`https://api.exchangeratesapi.io/latest?base=${base}`, (err, data) => {
+			if (err) {
+				console.log(err.message)
+				process.exit()
+			}
+			const obj = JSON.parse(data)
+			printObject(obj)
+			process.exit()
+		})
+	})
+})
+
+function getInput(prompt, callback) {
+	try {
+		process.stdin.resume()
+		process.stdin.setEncoding('utf8')
+		process.stdout.write(`${prompt}: `)
+		process.stdin.on('data', text => callback(null, text))
+	} catch(err) {
+		callback(err)
+	}
+}
+
+function checkValidCurrencyCode(code, callback) {
+	code = code.trim()
+	request('https://api.exchangeratesapi.io/latest', (err, res, body) => {
+		if (err) callback(new Error('invalid API call'))
+		const rates = JSON.parse(body).rates
+		if (!rates.hasOwnProperty(code)) callback(new Error(`invalid currency code ${code}`))
+		callback(null, true)
+	})
+}
+
+function getData(url, callback) {
+	request(url, (err, res, body) => {
+		if (err) callback(new Error('invalid API call'))
+		callback(null, body)
+	})
+}
+
+function printObject(data) {
+	const indent = 2
+	const str = JSON.stringify(data, null, indent)
+	console.log(str)
+}
diff --git a/exercises/06_code_quality/package.json b/exercises/06_code_quality/package.json
index 6c5393de..6eb0a08d 100644
--- a/exercises/06_code_quality/package.json
+++ b/exercises/06_code_quality/package.json
@@ -34,6 +34,9 @@
     "koa-static": "^5.0.0",
     "koa-views": "^6.1.5",
     "mime-types": "^2.1.22",
+    "readline": "^1.3.0",
+    "readline-sync": "^1.4.10",
+    "request": "^2.88.0",
     "sqlite-async": "^1.0.11"
   },
   "devDependencies": {
diff --git a/exercises/06_code_quality/promises.js b/exercises/06_code_quality/promises.js
new file mode 100644
index 00000000..30397aea
--- /dev/null
+++ b/exercises/06_code_quality/promises.js
@@ -0,0 +1,53 @@
+
+'use strict'
+
+const request = require('request')
+const readline = require('readline')
+
+const baseURL = 'https://api.exchangeratesapi.io/latest'
+
+const getInput = prompt => new Promise(resolve => {
+	const read = readline.createInterface({ input: process.stdin, output: process.stdout })
+	read.question(`${prompt}: `, value => {
+		console.log(`You entered ${value}`)
+		read.close()
+		resolve(value)
+	})
+})
+
+const checkValidCurrencyCode = code => new Promise( (resolve, reject) => {
+	code = code.trim()
+	request(baseURL, (err, res, body) => {
+		if (err) reject(new Error('invalid API call'))
+		const rates = JSON.parse(body).rates
+		if (!rates.hasOwnProperty(code)) reject(new Error(`invalid currency code ${code}`))
+		resolve(code)
+	})
+})
+
+const getData = code => new Promise( (resolve, reject) => {
+	request(`${baseURL}?base=${code}`, (err, res, body) => {
+		if (err) reject(new Error('invalid API call'))
+		resolve(body)
+	})
+})
+
+const printObject = data => new Promise( resolve => {
+	const indent = 2
+	data = JSON.parse(data)
+	const str = JSON.stringify(data, null, indent)
+	console.log(str)
+	resolve()
+})
+
+const exit = () => new Promise( () => {
+	process.exit()
+})
+
+getInput('enter base currency')
+	.then(checkValidCurrencyCode)
+	.then(getData)
+	.then(printObject)
+	.then(exit)
+	.catch( err => console.error(`error: ${err.message}`))
+  .then(exit)
diff --git a/exercises/06_code_quality/shopping/login/index.js b/exercises/06_code_quality/shopping/login/index.js
new file mode 100644
index 00000000..0f4f6fd2
--- /dev/null
+++ b/exercises/06_code_quality/shopping/login/index.js
@@ -0,0 +1,147 @@
+#!/usr/bin/env node
+
+/**
+ * Routes File
+ */
+
+'use strict'
+
+/* MODULE IMPORTS */
+const Koa = require('koa')
+const Router = require('koa-router')
+const views = require('koa-views')
+const staticDir = require('koa-static')
+const bodyParser = require('koa-bodyparser')
+const koaBody = require('koa-body')({multipart: true, uploadDir: '.'})
+const session = require('koa-session')
+const sqlite = require('sqlite-async')
+const bcrypt = require('bcrypt-promise')
+const fs = require('fs-extra')
+const mime = require('mime-types')
+//const jimp = require('jimp')
+
+/* IMPORT CUSTOM MODULES */
+const accounts = require('./modules/accounts')
+
+const app = new Koa()
+const router = new Router()
+
+/* CONFIGURING THE MIDDLEWARE */
+app.keys = ['darkSecret']
+app.use(staticDir('public'))
+app.use(bodyParser())
+app.use(session(app))
+app.use(views(`${__dirname}/views`, { extension: 'handlebars' }, {map: { handlebars: 'handlebars' }}))
+
+const port = 8080
+const saltRounds = 10
+
+/**
+ * The secure home page.
+ *
+ * @name Home Page
+ * @route {GET} /
+ * @authentication This route requires cookie-based authentication.
+ */
+router.get('/', async ctx => {
+	try {
+		if(ctx.session.authorised !== true) return ctx.redirect('/login?msg=you need to log in')
+		const data = {}
+		if(ctx.query.msg) data.msg = ctx.query.msg
+		await ctx.render('index')
+	} catch(err) {
+		await ctx.render('error', {message: err.message})
+	}
+})
+
+/**
+ * The user registration page.
+ *
+ * @name Register Page
+ * @route {GET} /register
+ */
+router.get('/register', async ctx => await ctx.render('register'))
+
+/**
+ * The script to process new user registrations.
+ *
+ * @name Register Script
+ * @route {POST} /register
+ */
+router.post('/register', koaBody, async ctx => {
+	try {
+		const body = ctx.request.body
+		console.log(body)
+		// PROCESSING FILE
+		const {path, type} = ctx.request.files.avatar
+		const fileExtension = mime.extension(type)
+		console.log(`path: ${path}`)
+		console.log(`type: ${type}`)
+		console.log(`fileExtension: ${fileExtension}`)
+		await fs.copy(path, 'public/avatars/avatar.png')
+		// ENCRYPTING PASSWORD AND BUILDING SQL
+		body.pass = await bcrypt.hash(body.pass, saltRounds)
+		const sql = `INSERT INTO users(user, pass) VALUES("${body.user}", "${body.pass}")`
+		console.log(sql)
+		// DATABASE COMMANDS
+		const db = await sqlite.open('./website.db')
+		await db.run(sql)
+		await db.close()
+		// REDIRECTING USER TO HOME PAGE
+		ctx.redirect(`/?msg=new user "${body.name}" added`)
+	} catch(err) {
+		await ctx.render('error', {message: err.message})
+	}
+})
+
+router.get('/login', async ctx => {
+	const data = {}
+	if(ctx.query.msg) data.msg = ctx.query.msg
+	if(ctx.query.user) data.user = ctx.query.user
+	await ctx.render('login', data)  
+})
+
+router.post('/login', async ctx => {
+	try {
+		const body = ctx.request.body
+		const db = await sqlite.open('./website.db')
+		// DOES THE USERNAME EXIST?
+		const records = await db.get(`SELECT count(id) AS count FROM users WHERE user="${body.user}";`)
+		if(!records.count) return ctx.redirect('/login?msg=invalid%20username')
+		const record = await db.get(`SELECT pass FROM users WHERE user = "${body.user}";`)
+		await db.close()
+		// DOES THE PASSWORD MATCH?
+		const valid = await bcrypt.compare(body.pass, record.pass)
+		if(valid == false) return ctx.redirect(`/login?user=${body.user}&msg=invalid%20password`)
+		// WE HAVE A VALID USERNAME AND PASSWORD
+		ctx.session.authorised = true
+		return ctx.redirect('/?msg=you are now logged in...')
+	} catch(err) {
+		await ctx.render('error', {message: err.message})
+	}
+})
+
+// router.post('/login', async ctx => { // 19 lines reduced to 10!
+// 	const body = ctx.request.body
+// 	try {
+// 		await accounts.checkCredentials(body.user, body.pass)
+// 		ctx.session.authorised = true
+// 		return ctx.redirect('/?msg=you are now logged in...')
+// 	} catch(err) {
+// 		return ctx.redirect(`/login?user=${body.user}&msg=${err.message}`)
+// 	}
+// })
+
+router.get('/logout', async ctx => {
+	ctx.session.authorised = null;
+	ctx.redirect('/')	
+})
+
+app.use(router.routes())
+module.exports = app.listen(port, async() => {
+	// MAKE SURE WE HAVE A DATABASE WITH THE CORRECT SCHEMA
+	const db = await sqlite.open('./website.db')
+	await db.run('CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY AUTOINCREMENT, user TEXT, pass TEXT);')
+	await db.close()
+	console.log(`listening on port ${port}`)
+})
diff --git a/exercises/06_code_quality/shopping/login/modules/accounts.js b/exercises/06_code_quality/shopping/login/modules/accounts.js
new file mode 100644
index 00000000..206b176b
--- /dev/null
+++ b/exercises/06_code_quality/shopping/login/modules/accounts.js
@@ -0,0 +1,28 @@
+
+'use strict'
+
+module.exports = class List {
+
+	constructor() {
+		this.items = []
+	}
+
+	add(item, qty) {
+		const data = {item: item, qty: qty}
+		this.items.push(data)
+	}
+
+	getAll() {
+		return this.items
+	}
+
+	delete(name) {
+		const index = this.items.indexOf(name)
+		if(index !== -1) this.items.splice(index, 1)
+	}
+
+	count() {
+		return this.items.count
+	}
+
+}
diff --git a/exercises/06_code_quality/shopping/login/modules/accounts.old.js b/exercises/06_code_quality/shopping/login/modules/accounts.old.js
new file mode 100644
index 00000000..5bcd7592
--- /dev/null
+++ b/exercises/06_code_quality/shopping/login/modules/accounts.old.js
@@ -0,0 +1,81 @@
+#!/usr/bin/env node
+
+/**
+ * Accounts module
+ * @module modules/accounts
+ */
+
+'use strict'
+
+var sqlite = require('sqlite-async');
+let bcrypt = require('bcrypt-promise');
+
+/**
+ * This is a generic function that opens the database, executes a query,
+ * closes the database connection and returns the data.  
+ * @param {String} query - The SQL statement to execute.
+ * @returns {Object} - the date returned by the query.
+ */
+async function runSQL(query) {
+    try {
+		console.log(query)
+		let DBName = "./website.db";
+		const db = await sqlite.open(DBName);	
+		const data = await db.all(query);  
+		await db.close();
+		if(data.length === 1) return data[0]
+		return data;
+	} catch(err) {
+		throw err
+	}
+}
+
+module.exports.checkCredentials = async(username, password)=> {
+	try {
+	    var records = await runSQL(`SELECT count(id) AS count FROM users WHERE user="${username}";`);
+		if(!records.count) throw new Error("invalid username")
+		const record = await runSQL(`SELECT pass FROM users WHERE user = "${username}";`)
+		const valid = await bcrypt.compare(password, record.pass)
+		if(valid == false) throw new Error(`invalid password`)
+		return true
+	} catch(err) {
+	throw err
+	}
+}
+
+
+
+/* ----------------------------- STUB FUNCTIONS ----------------------------- */
+
+/**
+ * This function checks the database to see if a username already exists in
+ * the database. If it detects a duplicate it throws an exception.
+ * @param {String} username - The username to check.
+ * @returns {boolean} - returns true if the username does not exist.
+ * @throws {Error} - throws an error if the username already exists.
+ */
+async function checkNoDuplicateUsername (username) {
+	return true
+}
+
+/**
+ * This function takes data from an uploaded image and saves it to the `avatars` directory. The file name will be the username.
+ * @param {String} path - the location of the uploaded image
+ * @param {String} mimeType - the mime type of the uploaded file.
+ * @returns {boolean} - returns true if the image is valid and is saved.
+ * @throws {TypeError} - throws an error if the file is not a png or jpg image.
+ */
+async function saveImage(path, mimetype) {
+	return true
+}
+
+/**
+ * This function adds new users to the database.
+ * @param {String} username - The username to to add.
+ * @param {String} password - The password to add.
+ * @returns {boolean} - returns true if the username does not exist.
+ * @throws {Error} - throws an error if the new user account has been created.
+ */
+module.exports.addUser = async(username, password) => {
+    return true;  
+}
\ No newline at end of file
diff --git a/exercises/06_code_quality/shopping/login/modules/user.js b/exercises/06_code_quality/shopping/login/modules/user.js
new file mode 100644
index 00000000..e69de29b
diff --git a/exercises/06_code_quality/shopping/login/package.json b/exercises/06_code_quality/shopping/login/package.json
new file mode 100644
index 00000000..d1885e7b
--- /dev/null
+++ b/exercises/06_code_quality/shopping/login/package.json
@@ -0,0 +1,57 @@
+{
+  "name": "10_auth",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "acceptance": "jest --coverage --detectOpenHandles",
+    "jsdoc": "node_modules/.bin/jsdoc -c jsdoc.conf",
+    "linter": "node_modules/.bin/eslint .",
+    "test": "jest --coverage --detectOpenHandles",
+    "unit": "node_modules/.bin/jest --coverage --runInBand tests/unit/"
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "verbose": true,
+    "collectCoverage": true,
+    "coverageDirectory": "docs/coverage/",
+    "coverageThreshold": {
+      "global": {
+        "branches": 0,
+        "functions": 0,
+        "lines": 0,
+        "statements": 0
+      }
+    }
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "bcrypt": "^3.0.3",
+    "bcrypt-promise": "^2.0.0",
+    "fs-extra": "^7.0.1",
+    "handlebars": "^4.1.2",
+    "jimp": "^0.6.0",
+    "koa": "^2.6.2",
+    "koa-body": "^4.0.8",
+    "koa-bodyparser": "^4.2.1",
+    "koa-router": "^7.4.0",
+    "koa-session": "^5.10.1",
+    "koa-static": "^5.0.0",
+    "koa-views": "^6.1.5",
+    "mime-types": "^2.1.22",
+    "sqlite-async": "^1.0.11"
+  },
+  "devDependencies": {
+    "eslint": "^5.15.2",
+    "handlebars-validate": "^0.1.2",
+    "html-validator-cli": "^6.0.0",
+    "http-status-codes": "^1.3.2",
+    "jest": "^24.1.0",
+    "jsdoc": "^3.5.5",
+    "jsdoc-route-plugin": "^0.1.0",
+    "puppeteer": "^1.12.2",
+    "site-validator-cli": "^1.0.1",
+    "supertest": "^4.0.2"
+  }
+}
diff --git a/exercises/06_code_quality/shopping/login/public/avatars/avatar.png b/exercises/06_code_quality/shopping/login/public/avatars/avatar.png
new file mode 100644
index 00000000..125a3893
Binary files /dev/null and b/exercises/06_code_quality/shopping/login/public/avatars/avatar.png differ
diff --git a/exercises/06_code_quality/shopping/login/public/style.css b/exercises/06_code_quality/shopping/login/public/style.css
new file mode 100644
index 00000000..d712b576
--- /dev/null
+++ b/exercises/06_code_quality/shopping/login/public/style.css
@@ -0,0 +1,11 @@
+body {
+    font-family: Arial, Helvetica, sans-serif;
+  }
+  
+  .msg {
+    border: 1px solid red;
+    font-weight: bold;
+    color: red;
+    padding: 1em;
+  }
+  
\ No newline at end of file
diff --git a/exercises/06_code_quality/shopping/login/views/error.handlebars b/exercises/06_code_quality/shopping/login/views/error.handlebars
new file mode 100644
index 00000000..5d00fd37
--- /dev/null
+++ b/exercises/06_code_quality/shopping/login/views/error.handlebars
@@ -0,0 +1,15 @@
+<!doctype html>
+
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<title>ERROR</title>
+		<meta name="description" content="The HTML5 Template">
+		<meta name="author" content="Joe Bloggs">
+		<link href="style.css" type="text/css" rel="stylesheet" />
+	</head>
+	<body>
+        <h1>An Error Has Occurred</h1>
+        <h2>{{message}}</h2>
+	</body>
+</html>
diff --git a/exercises/06_code_quality/shopping/login/views/index.handlebars b/exercises/06_code_quality/shopping/login/views/index.handlebars
new file mode 100644
index 00000000..681f382c
--- /dev/null
+++ b/exercises/06_code_quality/shopping/login/views/index.handlebars
@@ -0,0 +1,14 @@
+<!doctype html>
+
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<title>Home Page</title>
+		<meta name="description" content="form to add new books">
+		<meta name="author" content="Mark Tyers">
+		<link href="style.css" type="text/css" rel="stylesheet" />
+	</head>
+	<body>
+		<h1>Home</h1>
+		<p>This is a secure page. Users need to have a valid account and be logged in to see it.</p>
+</html>
diff --git a/exercises/06_code_quality/shopping/login/views/login.handlebars b/exercises/06_code_quality/shopping/login/views/login.handlebars
new file mode 100644
index 00000000..d83f8b46
--- /dev/null
+++ b/exercises/06_code_quality/shopping/login/views/login.handlebars
@@ -0,0 +1,23 @@
+
+<!doctype html>
+
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<title>Log In</title>
+		<meta name="description" content="form to add new books">
+		<meta name="author" content="Mark Tyers">
+		<link href="style.css" type="text/css" rel="stylesheet" />
+	</head>
+	<body>
+		<h1>Log In</h1>
+		{{#if msg}}
+ 			<p class="msg">{{msg}}</p>
+		{{/if}}
+		<form action="/login" method="post">
+			<p>Username:<br /><input type="text" name="user" placeholder="your username" value="{{user}}" autofocus></p>
+			<p>Password:<br /><input type="password" name="pass" placeholder="your password" value=""></p>
+			<p><input type="submit" value="Log in"></p>
+		</form>
+	</body>
+</html>
diff --git a/exercises/06_code_quality/shopping/login/views/register.handlebars b/exercises/06_code_quality/shopping/login/views/register.handlebars
new file mode 100644
index 00000000..d39b8635
--- /dev/null
+++ b/exercises/06_code_quality/shopping/login/views/register.handlebars
@@ -0,0 +1,20 @@
+<!doctype html>
+
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<title>Create an Account</title>
+		<meta name="description" content="form to add new books">
+		<meta name="author" content="Mark Tyers">
+		<link href="style.css" type="text/css" rel="stylesheet" />
+	</head>
+	<body>
+		<h1>Create an Account</h1>
+		<form action="/register" enctype="multipart/form-data" method="post">
+			<p>Username:<br /><input type="text" name="user" placeholder="your preferred username (no spaces)" value=""></p>
+            <p>Password:<br /><input type="password" name="pass" placeholder="your chosen password" value=""></p>
+			<p>Profile Picture:<br /><input type="file" name="avatar"></p>
+			<p><input type="submit" value="Create"></p>
+		</form>
+	</body>
+</html>
diff --git a/exercises/06_code_quality/todo/index.js b/exercises/06_code_quality/todo/index.js
new file mode 100644
index 00000000..914ec5bf
--- /dev/null
+++ b/exercises/06_code_quality/todo/index.js
@@ -0,0 +1,61 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const Koa = require('koa')
+const Router = require('koa-router')
+const stat = require('koa-static')
+const bodyParser = require('koa-bodyparser')
+const handlebars = require('koa-hbs-renderer')
+
+const app = new Koa()
+const router = new Router()
+app.use(stat('public'))
+app.use(bodyParser())
+app.use(handlebars({ paths: { views: `${__dirname}/views` } }))
+app.use(router.routes())
+
+const port = 8080
+
+const items = []
+
+// const List = require('./modules/list')
+// const list = new List()
+
+router.get('/', async ctx => {
+	try {
+		const data = {}
+		if(ctx.query.msg) data.msg = ctx.query.msg
+		data.items = items.map( (element, index) => ({key: index, item: element.item, qty: element.qty}))
+		console.log(data.items)
+		ctx.render('home', data)
+	} catch(err) {
+		console.log(err.message)
+		ctx.render('home', {msg: err.message})
+	}
+})
+
+router.post('/', ctx => {
+	try {
+		const body = ctx.request.body
+		const data = {item: body.item, qty: body.qty}
+		items.push(data)
+		ctx.redirect('/')
+	} catch(err) {
+		console.log(err.message)
+		ctx.redirect(`/?msg=${err.message}`)
+	}
+})
+
+router.get('/delete/:key', ctx => {
+	try {
+		console.log(`key: ${ctx.params.key}`)
+		items.splice(ctx.params.key, 1)
+		ctx.redirect('/msg=item deleted')
+	} catch(err) {
+		console.log(err.message)
+		ctx.redirect(`/${err.message}`)
+	}
+})
+
+module.exports = app.listen(port, () => console.log(`listening on port ${port}`))
diff --git a/exercises/06_code_quality/todo/modules/list.js b/exercises/06_code_quality/todo/modules/list.js
new file mode 100644
index 00000000..0849e064
--- /dev/null
+++ b/exercises/06_code_quality/todo/modules/list.js
@@ -0,0 +1,27 @@
+
+'use strict'
+
+module.exports = class List {
+
+	constructor() {
+		this.items = []
+	}
+
+	add(item, qty) {
+		const data = {item: item, qty: qty}
+		this.items.push(data)
+	}
+
+	getAll() {
+		return this.items.map( (element, index) => ({key: index, item: element.item, qty: element.qty}))
+	}
+
+	delete(id) {
+		this.items.splice(id, 1)
+	}
+
+	count() {
+		return this.items.count
+	}
+
+}
diff --git a/exercises/06_code_quality/todo/package.json b/exercises/06_code_quality/todo/package.json
new file mode 100644
index 00000000..e3637641
--- /dev/null
+++ b/exercises/06_code_quality/todo/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "todo",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "linter": "node_modules/.bin/eslint ."
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "handlebars": "^4.2.0",
+    "koa": "^2.8.1",
+    "koa-bodyparser": "^4.2.1",
+    "koa-handlebars": "^1.0.0",
+    "koa-hbs-renderer": "^1.2.0",
+    "koa-router": "^7.4.0",
+    "koa-static": "^5.0.0",
+    "koa-views": "^6.2.1"
+  },
+  "devDependencies": {}
+}
diff --git a/exercises/06_code_quality/todo/views/empty.hbs b/exercises/06_code_quality/todo/views/empty.hbs
new file mode 100644
index 00000000..6be9593a
--- /dev/null
+++ b/exercises/06_code_quality/todo/views/empty.hbs
@@ -0,0 +1,19 @@
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>ToDo List</title>
+		<link rel="stylesheet" href="style.css" />
+	</head>
+	<body>
+		<h1>ToDo List</h1>
+		<h2>Your list is empty, lets add some items...</h2>
+		<form method="post" action="/">
+			Item:
+			<input type="text" name="item" />
+			Qty:
+			<input type="text" name="qty" />
+			<input type="submit" value="Add Item" />
+		</form>
+	</body>
+</html>
diff --git a/exercises/06_code_quality/todo/views/home.hbs b/exercises/06_code_quality/todo/views/home.hbs
new file mode 100644
index 00000000..1a9495f0
--- /dev/null
+++ b/exercises/06_code_quality/todo/views/home.hbs
@@ -0,0 +1,33 @@
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>ToDo List</title>
+		<link rel="stylesheet" href="style.css" />
+	</head>
+	<body>
+		<h1>ToDo List</h1>
+		<h2>My List</h2>
+		{{#if msg}}
+ 			<p class="msg">{{msg}}</p>
+		{{/if}}
+		{{#if items.length}}
+    <table>
+	    <caption>Shopping List</caption>
+	    <tr><th>Item</th><th>Qty</th><th>Action</th></tr>
+	      {{#each items}}
+		      <tr><td>{{this.item}}</td><td>{{this.qty}}</td><td><a href="/delete/{{this.key}}">delete</a></td></tr>
+				{{/each}}
+    </table>
+		{{else}}
+		<h2>Your list is empty, lets add some items...</h2>
+		{{/if}}
+		<form method="post" action="/">
+			Item:
+			<input type="text" name="item" />
+			Qty:
+			<input type="text" name="qty" />
+			<input type="submit" value="Add Item" />
+		</form>
+	</body>
+</html>
diff --git a/exercises/07_unit_testing/filesystem/modules/file.js b/exercises/07_unit_testing/filesystem/modules/file.js
new file mode 100644
index 00000000..ec5e4202
--- /dev/null
+++ b/exercises/07_unit_testing/filesystem/modules/file.js
@@ -0,0 +1,35 @@
+
+'use strict'
+
+const fs = require('fs')
+
+module.exports = class File {
+
+	constructor(name) {
+		return async() => {
+			this.filename = name
+		}
+	}
+
+	async add(item, qty) {
+		fs.readFile(this.filename, 'utf8', (err, data) => {
+			if (err) throw new Error('file not found')
+			data = JSON.parse(data)
+			data.append({ item, qty })
+			data = JSON.stringify(data)
+			fs.writeFile(this.filename, data, 'utf8', (err) => {
+				if(err) throw err
+			} )
+		})
+	}
+
+	get records() {
+		return async() => {
+			fs.readFile(this.filename, 'utf8', (err, data) => {
+				if (err) throw new Error('file not found')
+				return JSON.parse(data)
+			})
+		}
+	}
+
+}
diff --git a/exercises/07_unit_testing/filesystem/package.json b/exercises/07_unit_testing/filesystem/package.json
new file mode 100644
index 00000000..2cc74c64
--- /dev/null
+++ b/exercises/07_unit_testing/filesystem/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "filesystem",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "mock-fs": "^4.10.1"
+  }
+}
diff --git a/exercises/07_unit_testing/filesystem/unit tests/file.spec.js b/exercises/07_unit_testing/filesystem/unit tests/file.spec.js
new file mode 100644
index 00000000..8bdf4f84
--- /dev/null
+++ b/exercises/07_unit_testing/filesystem/unit tests/file.spec.js	
@@ -0,0 +1,33 @@
+
+'use strict'
+
+const File = require('../modules/file.js')
+const mock = require('mock-fs')
+
+beforeAll( async() => {
+	mock({
+		'data': {
+			'test.json': '["item": "bread", "qty": 42]'
+		}
+	})
+})
+
+describe('xxx', () => {
+
+	beforeEach( async() => {
+		const file = new File()
+	})
+	afterEach( async() => {
+		// runs after each test completes
+	})
+	test('xxx', async done => {
+		expect.assertions(1)
+		try {
+			// XXX
+		} catch(err) {
+			// XXX
+		} finally {
+			done()
+		}
+	})
+})
diff --git a/exercises/07_unit_testing/otherScripts/addressFinder.js b/exercises/07_unit_testing/otherScripts/addressFinder.js
new file mode 100644
index 00000000..e158d201
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/addressFinder.js
@@ -0,0 +1,32 @@
+
+'use strict'
+
+const request = require('request')
+
+try {
+	if (process.argv.length < 3) {
+		throw 'missing parameter'
+	}
+	let address = process.argv[2]
+	/* we need to remove the single quotes from the string */
+	address = address.replace(/'/g,'')
+	console.log(address)
+	const url = `https://maps.googleapis.com/maps/api/geocode/json?region=gb&units=metric&appid=44c39f3fa462f86b3fc88f5678e5c5ff&address=${address}`
+	console.log(url)
+	request.get( url, (err, res, body) => {
+		if (err) {
+			throw 'could not complete request'
+		}
+		const json = JSON.parse(body)
+		console.log(JSON.stringify(json, null, 2))
+		try {
+			if (json.status === 'ZERO_RESULTS') {
+				throw 'no results found'
+			}
+		} catch(err) {
+			console.log(err)
+		}
+	})
+} catch(err) {
+	console.log(err)
+}
\ No newline at end of file
diff --git a/exercises/07_unit_testing/otherScripts/arrowFunctions.js b/exercises/07_unit_testing/otherScripts/arrowFunctions.js
new file mode 100644
index 00000000..47c6af30
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/arrowFunctions.js
@@ -0,0 +1,41 @@
+
+'use strict'
+
+/* eslint no-magic-numbers: 0, arrow-body-style: 0 */
+
+// all four of these functions contain the same functionality.
+
+// traditional JavaScript function that takes an ECMA rest param and returns the total
+// no use made of functional programming principles.
+function add(...num) {
+	let total = 0
+
+	for (let i=0; i< num.length; i++) {
+		total += num[i]
+	}
+	return total
+}
+
+// simple ECMAScript 5 compatible anonymous function assigned to a constant.
+// Array.prototype.reduce used to eliminate the loop from the previous example.
+const add2 = function(...num) {
+	return num.reduce( (acc, val) => acc + val)
+}
+
+// arrow function syntax used instead of the traditional anonymous function declaration.
+// normally a single parameter would not be enclosed in braces but these are needed for rest params.
+const add3 = (...num) => {
+	return num.reduce( (acc, val) => acc + val)
+}
+
+// if the body of the function contains a single line of code that returns a value
+// the braces and return statement are not required.
+const add4 = (...num) => num.reduce( (acc, val) => acc + val)
+
+console.log(add(1, 2, 3))
+
+console.log(add2(1, 2, 3))
+
+console.log(add3(1, 2, 3))
+
+console.log(add4(1, 2, 3))
diff --git a/exercises/07_unit_testing/otherScripts/asyncDemo.js b/exercises/07_unit_testing/otherScripts/asyncDemo.js
new file mode 100644
index 00000000..d2e18c5b
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/asyncDemo.js
@@ -0,0 +1,35 @@
+
+'use strict'
+
+const asyncFunc = (name, callback) => {
+	const names = ['colin', 'bob']
+	if (names.indexOf(name) > -1) {
+		// success
+		const result = 'found'
+		return callback(null, result)
+	} else {
+		// error
+		const message = 'name not found'
+		return callback(message)
+	}
+}
+
+// check username exists
+const check = name => {
+	asyncFunc(name, (err, result) => {
+		if (err) {
+			// it didn't work i.e. not found
+			console.error(err)
+			throw new Error('broke looking for name')
+		} else {
+			// success: i.e. result has a value
+			console.log('It was found.')
+			console.log(result)
+		}
+	})
+}
+
+check('colin')
+check('nobody')
+
+// (err, data) => {} is common callback signature
\ No newline at end of file
diff --git a/exercises/07_unit_testing/otherScripts/asyncFunctions.js b/exercises/07_unit_testing/otherScripts/asyncFunctions.js
new file mode 100644
index 00000000..7d758f93
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/asyncFunctions.js
@@ -0,0 +1,50 @@
+
+'use strict'
+
+const request = require('request')
+
+async function main() {
+	try {
+		const base = await getInput('enter base currency')
+		await checkValidCurrencyCode(base)
+		const data = await getData(`http://api.fixer.io/latest?base=${base}`)
+		await printObject(data)
+		process.exit()
+	} catch (err) {
+		console.log(`error: ${err.message}`)
+	}
+}
+
+const getInput = prompt => new Promise( (resolve) => {
+	process.stdin.resume()
+	process.stdin.setEncoding('utf8')
+	process.stdout.write(`${prompt}: `)
+	process.stdin.on('data', text => resolve(text))
+})
+
+const checkValidCurrencyCode = code => new Promise( (resolve, reject) => {
+	code = code.trim()
+	request('http://api.fixer.io/latest', (err, res, body) => {
+		if (err) reject(new Error('invalid API call'))
+		const rates = JSON.parse(body).rates
+		if (!rates.hasOwnProperty(code)) it.throw(new Error(`invalid currency code ${code}`))
+		resolve()
+	})
+})
+
+const getData = url => new Promise( (resolve, reject) => {
+	request(url, (err, res, body) => {
+		if (err) reject(new Error('invalid API call'))
+		resolve(body)
+	})
+})
+
+const printObject = data => new Promise( (resolve) => {
+	const indent = 2
+	data = JSON.parse(data)
+	const str = JSON.stringify(data, null, indent)
+	console.log(str)
+	resolve()
+})
+
+main()
diff --git a/exercises/07_unit_testing/otherScripts/books.js b/exercises/07_unit_testing/otherScripts/books.js
new file mode 100755
index 00000000..83bd49aa
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/books.js
@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+
+'use strict'
+
+function Book(isbn, title) {
+	this.isbn = isbn
+	this.title = title
+	this.year = null
+	Object.defineProperty(this, 'published', {
+		get: () => this.year,
+		set: year => this.year = year
+	})
+	Object.defineProperty(this, 'summary', {
+		get: () => `${this.title} (${this.isbn}). Published ${this.year}.`
+	})
+}
+
+const b = new Book('1491943122', 'Learning Node')
+if (b instanceof Book) console.log('its a Book')
+console.log(`the b object is a '${typeof b}'`)
+console.log(b.published) // prints null
+b.year = 2016
+console.log(b.published) // prints 2016
+console.log(b)
+console.log(b.summary)
diff --git a/exercises/07_unit_testing/otherScripts/classes/employee.js b/exercises/07_unit_testing/otherScripts/classes/employee.js
new file mode 100755
index 00000000..4e7716f9
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/classes/employee.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+/* eslint no-magic-numbers: 0 */
+
+'use strict'
+
+const Person = require('./person')
+
+module.exports = class Employee extends Person {
+
+	constructor(firstname, lastname, grade = 1) {
+		super(firstname, lastname)
+		this.joinedDate = new Date()
+		this.grade = grade
+	}
+
+	calculateSalary(months = 1) {
+		return this.grade * 1000 * months
+	}
+
+}
diff --git a/exercises/07_unit_testing/otherScripts/classes/employeeTest.js b/exercises/07_unit_testing/otherScripts/classes/employeeTest.js
new file mode 100755
index 00000000..dbfde4c0
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/classes/employeeTest.js
@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+/* eslint no-magic-numbers: 0 */
+
+'use strict'
+
+const Employee = require('./employee')
+
+try {
+	const worker = new Employee('John', 'Doe')
+	console.log(worker.name)
+
+	const salary = worker.calculateSalary()
+	console.log(salary)
+
+	const manager = new Employee('Peter', 'Piper', 4)
+	console.log(manager.name)
+	console.log(manager.calculateSalary(6))
+	console.log(manager)
+
+} catch(err) {
+	console.log(`ERROR: ${err}`)
+}
\ No newline at end of file
diff --git a/exercises/07_unit_testing/otherScripts/classes/person.js b/exercises/07_unit_testing/otherScripts/classes/person.js
new file mode 100755
index 00000000..1c84087e
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/classes/person.js
@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+
+'use strict'
+
+/** Class representing a person */
+module.exports = class Person {
+
+	/**
+	 * Create a person
+	 * @param {string} firstname - the person's first name
+	 * @param {string} lastname - the person's last name
+	 */
+	constructor(firstname, lastname) {
+		if (firstname === undefined || lastname === undefined) {
+			throw new Error('missing parameter')
+		}
+		this.first = firstname
+		this.last = lastname
+	}
+
+	/**
+	 * Set the person's first name
+	 * @param {string} name - the person's first name
+	 */
+	set firstName(name) {
+		this.first = name
+	}
+
+	/**
+	 * Set the person's last name
+	 * @param {string} name - the person's last name
+	 */
+	set lastName(name) {
+		this.last = name
+	}
+
+	/**
+	 * Get the person's full name
+	 * @return {string} the person's full name
+	 */
+	get name() {
+		return `${this.first} ${this.last}`
+	}
+
+}
diff --git a/exercises/07_unit_testing/otherScripts/classes/personTest.js b/exercises/07_unit_testing/otherScripts/classes/personTest.js
new file mode 100755
index 00000000..3cdd030a
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/classes/personTest.js
@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const Person = require('./person')
+try {
+	const person = new Person('Andy', 'Capp')
+	console.log(person.name)
+	person.lastName = 'Pandy'
+	console.log(JSON.stringify(person, null, 2))
+
+	const badPerson = new Person('anon')
+	console.log(badPerson)
+} catch(err) {
+	console.log(`ERROR: ${err}`)
+}
\ No newline at end of file
diff --git a/exercises/07_unit_testing/otherScripts/coffee/betterCoffee.js b/exercises/07_unit_testing/otherScripts/coffee/betterCoffee.js
new file mode 100755
index 00000000..21cc4908
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/coffee/betterCoffee.js
@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+
+'use strict'
+
+/* eslint no-magic-numbers: 0 */
+
+function Coffee(roast, ounces = 8) {
+
+	const privateData = {}
+
+	privateData.size = {
+		small: 8,
+		medium: 12,
+		large: 16
+	}
+
+	if (roast === undefined) {
+		throw new Error('missing roast type')
+	}
+
+	privateData.roast = roast
+	privateData.ounces = ounces
+
+	function getSize() {
+		if (this.ounces === this.size.small) {
+			return 'small'
+		} else if (this.ounces === this.size.medium) {
+			return 'medium'
+		} else if (this.ounces === this.size.large) {
+			return 'large'
+		}
+	}
+
+	return {
+		order: {
+			get: () => {
+				let msg
+				switch (getSize()) {
+					case 'small':
+					case 'medium':
+					case 'large':
+						msg = `You've ordered a ${getSize()} ${this.roast} coffee.`
+						break
+					default:
+						msg = `We don't have a ${this.roast} in that size!`
+						break
+				}
+				return msg
+			}
+		}
+	}
+
+} // end function Coffee
+
+try {
+	const coffee = new Coffee('House Blend', 12)
+	console.log(coffee.order)
+	console.log(coffee)
+
+	const darkRoast = new Coffee('Dark Roast', 16)
+	console.log(darkRoast.order)
+
+	const specialBlend = new Coffee('Special Blend', 200)
+	console.log(specialBlend.order)
+
+	const kenyan = new Coffee('Kenyan')
+	console.log(kenyan.order)
+
+	const anon = new Coffee()
+	console.log(anon.order)
+} catch(err) {
+	console.log(`ERROR: ${err}`)
+}
\ No newline at end of file
diff --git a/exercises/07_unit_testing/otherScripts/coffee/coffee.js b/exercises/07_unit_testing/otherScripts/coffee/coffee.js
new file mode 100755
index 00000000..29341898
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/coffee/coffee.js
@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const small = 8
+const medium = 12
+const large = 16
+
+module.exports = function(roast, ounces = small) { // can't use arrow functions here...
+	if (roast === undefined) {
+		throw new Error('missing roast type')
+	}
+	this.roast = roast
+	this.ounces = ounces
+	this.getSize = () => {
+		if (this.ounces === small) {
+			return 'small'
+		} else if (this.ounces === medium) {
+			return 'medium'
+		} else if (this.ounces === large) {
+			return 'large'
+		}
+	}
+	this.order = () => {
+		let msg
+		switch (this.getSize()) {
+			case 'small':
+			case 'medium':
+			case 'large':
+				msg = `You've ordered a ${this.getSize()} ${this.roast} coffee.`
+				break
+			default:
+				msg = `We don't have a ${this.roast} in that size!`
+				break
+		}
+		return msg
+	}
+}
diff --git a/exercises/07_unit_testing/otherScripts/coffee/coffee2.js b/exercises/07_unit_testing/otherScripts/coffee/coffee2.js
new file mode 100755
index 00000000..858f1170
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/coffee/coffee2.js
@@ -0,0 +1,68 @@
+#!/usr/bin/env node
+/* eslint no-magic-numbers: 0 */
+
+'use strict'
+
+function Coffee(roast, ounces = this.size.small) {
+
+	this.size = {
+		small: 8,
+		medium: 12,
+		large: 16
+	}
+
+	if (roast === undefined) {
+		throw new Error('missing roast type')
+	}
+
+	this.roast = roast
+	this.ounces = ounces
+
+	this.getSize = () => {
+		if (this.ounces === this.size.small) {
+			return 'small'
+		} else if (this.ounces === this.size.medium) {
+			return 'medium'
+		} else if (this.ounces === this.size.large) {
+			return 'large'
+		}
+	}
+
+	Object.defineProperty(this, 'order', {
+		get: () => {
+			let msg
+			switch (this.getSize()) {
+				case 'small':
+				case 'medium':
+				case 'large':
+					msg = `You've ordered a ${this.getSize()} ${this.roast} coffee.`
+					break
+				default:
+					msg = `We don't have a ${this.roast} in that size!`
+					break
+			}
+			return msg
+		}
+	})
+
+} // end function Coffee
+
+try {
+	const coffee = new Coffee('House Blend', 12)
+	console.log(coffee.order)
+	console.log(coffee)
+
+	const darkRoast = new Coffee('Dark Roast', 16)
+	console.log(darkRoast.order)
+
+	const specialBlend = new Coffee('Special Blend', 200)
+	console.log(specialBlend.order)
+
+	const kenyan = new Coffee('Kenyan')
+	console.log(kenyan.order)
+
+	const anon = new Coffee()
+	console.log(anon.order)
+} catch(err) {
+	console.log(`ERROR: ${err}`)
+}
diff --git a/exercises/07_unit_testing/otherScripts/coffee/index.js b/exercises/07_unit_testing/otherScripts/coffee/index.js
new file mode 100755
index 00000000..4fa9e769
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/coffee/index.js
@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+/* eslint no-magic-numbers: 0 */
+
+'use strict'
+
+const Coffee = require('./coffee')
+
+try {
+	const coffee = new Coffee('House Blend', 12)
+	console.log(coffee.order())
+
+	const darkRoast = new Coffee('Dark Roast', 16)
+	console.log(darkRoast.order())
+
+	const specialBlend = new Coffee('Special Blend', 200)
+	console.log(specialBlend.order())
+
+	const kenyan = new Coffee('Kenyan')
+	console.log(kenyan.order())
+
+	const anon = new Coffee()
+	console.log(anon.order())
+} catch(err) {
+	console.log(`ERROR: ${err}`)
+}
diff --git a/exercises/07_unit_testing/otherScripts/counter.js b/exercises/07_unit_testing/otherScripts/counter.js
new file mode 100755
index 00000000..233793b5
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/counter.js
@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+//'use strict'
+
+(function() {
+	console.log('Woohoo!')
+})()
+
+// simple closure example (using an IIFE)
+const add = ( () => {
+	let count = 0
+	return () => count += 1
+})()
+
+add()
+add()
+console.log(add())
+
+// IIFE returning multiple functions via an object
+(() => {
+	let count = 0
+	return {
+		increment: () => count += 1,
+		display: () => count,
+		reset: () => count = 0
+	}
+})()
+
+counter.increment()
+counter.increment()
+console.log(counter.display())
+counter.reset()
+console.log(counter.display())
diff --git a/exercises/07_unit_testing/otherScripts/countries.md b/exercises/07_unit_testing/otherScripts/countries.md
new file mode 100644
index 00000000..ca84a337
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/countries.md
@@ -0,0 +1,11 @@
+
+'use strict'
+
+const request = require('sync-request')
+
+function checkCountryCode(code = 'GB') {
+    const res = request('GET', `https://restcountries.eu/rest/v2/alpha/${code}`)
+    if (res.statusCode === 400) {
+        throw new Error('invalid country code')
+    }
+}
diff --git a/exercises/07_unit_testing/otherScripts/currency.js b/exercises/07_unit_testing/otherScripts/currency.js
new file mode 100644
index 00000000..c833a560
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/currency.js
@@ -0,0 +1,23 @@
+
+'use strict'
+
+const request = require('request')
+
+try {
+	if (process.argv.length < 3) {
+		throw 'missing parameter'
+	}
+	const symbol = process.argv[2].toUpperCase()
+	const url = `http://api.fixer.io/latest?symbols=${symbol}`
+	console.log(url)
+	request.get( url, (err, res, body) => {
+		if (err) {
+			throw 'could not complete request'
+		}
+		const json = JSON.parse(body)
+		const output = JSON.stringify(json.rates, null, 2)
+		console.log(output)
+	})
+} catch(err) {
+	console.log(err)
+}
diff --git a/exercises/07_unit_testing/otherScripts/dogs/dog.js b/exercises/07_unit_testing/otherScripts/dogs/dog.js
new file mode 100755
index 00000000..9fd8cc52
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/dogs/dog.js
@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+/* eslint no-magic-numbers: 0 */
+
+'use strict'
+
+function Dog(name, breed, weight) {
+	this.name = name
+	this.breed = breed
+	this.weight = weight
+}
+
+Dog.prototype.species = 'Canine'
+Dog.prototype.sitting = false
+
+Dog.prototype.bark = function() {
+	const maxWeight = 25
+	if (this.weight > maxWeight) {
+		console.log(`${this.name} says Woof!`)
+	} else {
+		console.log(`${this.name} says Yip!`)
+	}
+}
+
+Dog.prototype.run = function() {
+	console.log('Run!')
+}
+
+Dog.prototype.wag = function() {
+	console.log('Wag!')
+}
+
+Dog.prototype.sit = function() {
+	if (this.sitting) {
+		console.log(`${this.name} is already sitting`)
+	} else {
+		this.sitting = true
+		console.log(`${this.name} is now sitting`)
+	}
+}
+
+module.exports = Dog
diff --git a/exercises/07_unit_testing/otherScripts/dogs/index.js b/exercises/07_unit_testing/otherScripts/dogs/index.js
new file mode 100755
index 00000000..29b20278
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/dogs/index.js
@@ -0,0 +1,35 @@
+#!/usr/bin/env node
+/* eslint no-magic-numbers: 0 */
+
+'use strict'
+
+const Dog = require('./dog')
+
+const fido = new Dog('Fido', 'Mixed', 38)
+const fluffy = new Dog('Fluffy', 'Poodle', 30)
+const spot = new Dog('Spot', 'Chihuahua', 10)
+const barnaby = new Dog('Barnaby', 'Basset Hound', 55)
+
+spot.bark = function() {
+	console.log(`${this.name} says WOOF!`)
+}
+
+fido.bark()
+fido.run()
+fido.wag()
+
+fluffy.bark()
+fluffy.run()
+fluffy.wag()
+
+spot.bark()
+spot.run()
+spot.wag()
+
+barnaby.sit()
+barnaby.sit()
+spot.sit()
+spot.sit()
+
+console.log(`Does spot have a sitting property? ${spot.hasOwnProperty('sitting')}`)
+console.log(`Does fido have a sitting property? ${fido.hasOwnProperty('sitting')}`)
\ No newline at end of file
diff --git a/exercises/07_unit_testing/otherScripts/employee.js b/exercises/07_unit_testing/otherScripts/employee.js
new file mode 100755
index 00000000..dd2753de
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/employee.js
@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const employee = {
+	firstName: 'Colin',
+	'last name': 'Stephen',
+	'department': 'Computing',
+	employment: {
+		department: 'Computing',
+		startDate: '20120815'
+	}
+}
+
+console.log(employee)
+const firstName = employee.firstName
+const lastName = employee['last name']
+const dept = employee.employment.department
+const grade = employee.employment.grade
+
+console.log(`${firstName} ${lastName} in ${dept} is at grade ${grade}`)
+
+console.log(employee.department)
+employee.department = 'Computer Science'
+console.log(employee.department)
+
+employee.grade = 4
+console.log(employee)
+console.log(grade)
+
+delete employee.department
+console.log(employee)
+
+// const nonExistentObject.postCode // throws "TypeError"
+// const addressObject = employee.address  // returns undefined
+// const postCode = employee.address.postCode // throws "TypeError"
+const postCode = employee.address && employee.address.postCode
+console.log(postCode)
diff --git a/exercises/07_unit_testing/otherScripts/flights.js b/exercises/07_unit_testing/otherScripts/flights.js
new file mode 100755
index 00000000..642d922a
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/flights.js
@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+
+'use strict'
+
+// example of a nested function
+function flights(airline, startCode, endCode) {
+	return function printDetails() {
+		return `you are flying ${airline} from ${startCode} to ${endCode}`
+	}
+}
+
+const flight = flights('KLM', 'BHX', 'JFK')
+const flightSummary = flight()
+console.log(flightSummary)
+
+// https://www.sitepoint.com/javascript-closures-demystified/
diff --git a/exercises/07_unit_testing/otherScripts/functional.js b/exercises/07_unit_testing/otherScripts/functional.js
new file mode 100644
index 00000000..451944d2
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/functional.js
@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+/* eslint no-magic-numbers: 0, arrow-body-style: 0 */
+
+'use strict'
+
+// the examples uses these two arrays
+const names = ['Mark', 'John', 'Stephen', 'James', 'William', 'John', 'Peter', 'Mark']
+const data = ['Coventry', 3.14159, 'Computer', 42, true, 365.25, 101]
+
+function makeUpperCase(name) {
+	return name.toUpperCase()
+}
+
+const upper1 = names.map(makeUpperCase)
+
+console.log('upper1')
+console.log(upper1)
+
+const upper2 = names.map( value => {
+	return value.toUpperCase()
+})
+
+console.log(upper2)
+
+const upper3 = names.map( value => value.toUpperCase() )
+
+console.log(upper3)
+
+const integers = data.filter( val => Number.isInteger(val) )
+
+console.log(integers)
+
+const strings = data.filter( val => typeof val === 'string')
+
+console.log(strings)
+
+const floats = data.filter( val => typeof val === 'number' && val % 1 !== 0)
+
+console.log(floats)
+
+const long2 = names.reduce( (acc, val) => {
+	if (val.length > acc.length) {
+		return val
+	} else {
+		return acc
+	}
+})
+
+console.log(long2)
+
+const long3 = names.reduce( (acc, val) => val.length > acc.length ? val : acc)
+
+console.log(long3)
+
+/* challenge: return the largest integer by chaining filter and reduce */
+
+/* The Array.reduce() function takes an optional second parameter which allows you to
+define a default value for the accumulator. In this example we wrap use the Array.map()
+function to loop through the names. We then use the Array.reduce() function with the
+accumulator defaulting to an empty array. */
+
+const rev1 = names.map( value => {
+	const rev = value.split('').reduce( (acc, val) => {
+		acc.unshift(val)
+		return acc
+	}, [])
+	return rev.join('')
+})
+
+console.log(rev1)
+
+// rewritten using a different approach.
+
+function reverse(acc, val) {
+	return val + acc
+}
+
+const rev = 'william'.split('').reduce(reverse, '')
+
+console.log(rev)
+
+/* As with all functional programming, with a few tweaks we can turn this into a single
+line. The example below uses a different approach to reversing the strings, can you
+figure out how this is done? */
+
+const reverse2 = names.map( value => value.split('').reduce( (acc, val) => val + acc, ''))
+
+console.log(reverse2)
+
+/* challenge: use the Array.reduce() function to remove duplicates in the names array */
diff --git a/exercises/07_unit_testing/otherScripts/generator.js b/exercises/07_unit_testing/otherScripts/generator.js
new file mode 100644
index 00000000..d493e3af
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/generator.js
@@ -0,0 +1,37 @@
+'use strict'
+
+const request = require('request')
+
+/**
+ * wrapper to make sure the callback invokes the generator next() method
+ * @param {String} url - the url to callback
+ * @returns {undefined} - the yeild
+ */
+function makeAPICall(url) {
+	request.get( url, (err, res, body) => {
+		if (err) it.throw(new Error(err))
+		it.next(JSON.parse(body))
+	})
+}
+
+/**
+ * the generator
+ * @param {String} symbol - the currency symbol to process
+ * @returns {undefined} - the yield
+ */
+function *main(symbol) {
+	try {
+		const url = `http://api.fixer.io/latest?symbols=${symbol}`
+		const result = yield makeAPICall(url)
+
+		console.log(JSON.stringify(result, null, 2))
+	} catch(err) {
+		console.log(err.message)
+	}
+}
+
+const it = main('GBP')
+
+it.next()
+
+// https://davidwalsh.name/async-generators
diff --git a/exercises/07_unit_testing/otherScripts/generators.js b/exercises/07_unit_testing/otherScripts/generators.js
new file mode 100644
index 00000000..6b20b965
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/generators.js
@@ -0,0 +1,56 @@
+
+// this example shows how to use a genrerator to simplify async code
+// after understanding this you should move onto promises
+// based on code by https://davidwalsh.name/async-generators
+
+'use strict'
+
+const request = require('request')
+
+function *main() {
+	try {
+		const base = yield getInput('enter base currency')
+		yield checkValidCurrencyCode(base)
+		const body = yield getData(`http://api.fixer.io/latest?base=${base}`)
+		const obj = JSON.parse(body)
+		printObject(obj)
+	} catch(err) {
+		console.log(err.message)
+	}
+	process.exit()
+}
+
+function getInput(prompt) {
+	process.stdin.resume()
+	process.stdin.setEncoding('utf8')
+	process.stdout.write(`${prompt}: `)
+	process.stdin.on('data', text => it.next(text))
+}
+
+function checkValidCurrencyCode(code) {
+	code = code.trim()
+	request('http://api.fixer.io/latest', (err, res, body) => {
+		if (err) it.throw(new Error('invalid API call'))
+		const rates = JSON.parse(body).rates
+		if (!rates.hasOwnProperty(code)) it.throw(new Error(`invalid currency code ${code}`))
+		it.next()
+	})
+}
+
+function getData(url) {
+	// the async call is 'hidden' in this function
+	request(url, (err, res, body) => {
+		if (err) it.throw(new Error('invalid API call'))
+		it.next(body)
+	})
+	// the function does not return anything
+}
+
+function printObject(data) {
+	const indent = 2
+	const str = JSON.stringify(data, null, indent)
+	console.log(str)
+}
+
+const it = main()
+it.next()
diff --git a/exercises/07_unit_testing/otherScripts/iteratingObjects.js b/exercises/07_unit_testing/otherScripts/iteratingObjects.js
new file mode 100755
index 00000000..6e058ab6
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/iteratingObjects.js
@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const abbreviations = {
+	json: 'javascript object notation',
+	yaml: 'yet another markup language',
+	xml: 'extensible markup language',
+	csv: 'comma-separated values'
+}
+
+for(const abbr in abbreviations) {
+	console.log(abbr)
+	console.log(abbreviations[abbr])
+}
diff --git a/exercises/07_unit_testing/otherScripts/iterator.js b/exercises/07_unit_testing/otherScripts/iterator.js
new file mode 100644
index 00000000..de3550d6
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/iterator.js
@@ -0,0 +1,20 @@
+
+'use strict'
+// https://developer.mozilla.org/en/docs/Web/JavaScript/Guide/Iterators_and_Generators
+
+const makeIterator = array => {
+	let nextIndex = 0
+
+	return {
+		next: () => {
+			if (nextIndex < array.length) return {value: array[nextIndex++], done: false}
+			return {done: true}
+		}
+	}
+}
+
+const it = makeIterator(['red', 'orange'])
+
+console.log(it.next().value)
+console.log(it.next().value)
+console.log(it.next().done)
diff --git a/exercises/07_unit_testing/otherScripts/moreCurrency.js b/exercises/07_unit_testing/otherScripts/moreCurrency.js
new file mode 100755
index 00000000..c80db492
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/moreCurrency.js
@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const readline = require('readline-sync')
+const request = require('sync-request')
+
+// the first step is to get a JavaScript object containing the exchange rates
+const base = 'GBP'
+const url = `http://api.fixer.io/latest?base=${base}`
+const res = request('GET', url)
+const rates = JSON.parse(String(res.getBody())).rates
+console.log(JSON.stringify(rates, null, 2))
+
+// ask the user for the currency code, convert to uppercase and remove whitespace. Notice the methods are 'chained'
+const code = String(readline.question('enter required currency code: ')).toUpperCase().trim()
+console.log(`you chose code: "${code}"`)
+
+// does the currency code exist as a key in the rates object?
+if (rates.hasOwnProperty(code)) {
+	console.log(`currency code ${code} is valid`)
+	const exchange = rates[code]
+	console.log(`exchange rate between ${base} and ${code} is ${exchange}`)
+} else {
+	console.log(`the code ${code} is not valid`)
+}
diff --git a/exercises/07_unit_testing/otherScripts/moreFunctional.js b/exercises/07_unit_testing/otherScripts/moreFunctional.js
new file mode 100644
index 00000000..fbb9c31e
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/moreFunctional.js
@@ -0,0 +1,26 @@
+
+'use strict'
+
+const arr = ['Steve', 'Alex', 'Dan', 'Alice', 'Bob']
+
+arr.forEach( (element, index) => console.log(`${index}: ${element}`))
+
+for(let i=0; i< arr.length; i++) {
+	console.log(arr[i])
+}
+
+const newArray = []
+
+for(let i=0; i< arr.length; i++) {
+	if (arr[i].charAt(0) === 'A') {
+		newArray.push(arr[i])
+	}
+}
+
+console.log(newArray)
+
+console.log(arr.filter( name => name.charAt(0) === 'A'))
+
+//const print = item => console.log(item)
+
+//arr.forEach( item => print(item) )
diff --git a/exercises/07_unit_testing/otherScripts/morePromises.js b/exercises/07_unit_testing/otherScripts/morePromises.js
new file mode 100644
index 00000000..c4d97678
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/morePromises.js
@@ -0,0 +1,42 @@
+
+'use strict'
+
+const request = require('request')
+
+try {
+	if (process.argv.length < 3) {
+		throw 'missing parameter'
+	}
+	const symbol = process.argv[2].toUpperCase()
+	getData(symbol)
+		.then( (result) => {
+			print(result)
+		}).catch( (error) => {
+			console.log(error)
+		})
+} catch(err) {
+	console.log(err)
+}
+
+function getData(symbol) {
+	return new Promise( (resolve, reject) => {
+		const url = `http://api.fixer.io/latest?symbols=${symbol}`
+		request.get( url, (err, res, body) => {
+			if (err) {
+				reject('could not complete request')
+			}
+			const json = JSON.parse(body)
+			resolve(json)
+		})
+	})
+}
+
+function print(data) {
+	return new Promise( (resolve, reject) => {
+		if (data.rates === undefined) {
+			reject('missing rates array')
+		}
+		console.log(data.rates)
+		resolve(data.rates)
+	})
+}
diff --git a/exercises/07_unit_testing/otherScripts/nestedCallbacks.js b/exercises/07_unit_testing/otherScripts/nestedCallbacks.js
new file mode 100644
index 00000000..cd3fcc12
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/nestedCallbacks.js
@@ -0,0 +1,61 @@
+
+'use strict'
+
+const request = require('request')
+
+getInput('enter base currency', (err, base) => {
+	if (err) {
+		console.log(err.message)
+		process.exit()
+	}
+	base = base.trim()
+	checkValidCurrencyCode(base, err => {
+		if (err) {
+			console.log(err.message)
+			process.exit()
+		}
+		getData(`http://api.fixer.io/latest?base=${base}`, (err, data) => {
+			if (err) {
+				console.log(err.message)
+				process.exit()
+			}
+			const obj = JSON.parse(data)
+			printObject(obj)
+			process.exit()
+		})
+	})
+})
+
+function getInput(prompt, callback) {
+	try {
+		process.stdin.resume()
+		process.stdin.setEncoding('utf8')
+		process.stdout.write(`${prompt}: `)
+		process.stdin.on('data', text => callback(null, text))
+	} catch(err) {
+		callback(err)
+	}
+}
+
+function checkValidCurrencyCode(code, callback) {
+	code = code.trim()
+	request('http://api.fixer.io/latest', (err, res, body) => {
+		if (err) callback(new Error('invalid API call'))
+		const rates = JSON.parse(body).rates
+		if (!rates.hasOwnProperty(code)) callback(new Error(`invalid currency code ${code}`))
+		callback(null, true)
+	})
+}
+
+function getData(url, callback) {
+	request(url, (err, res, body) => {
+		if (err) callback(new Error('invalid API call'))
+		callback(null, body)
+	})
+}
+
+function printObject(data) {
+	const indent = 2
+	const str = JSON.stringify(data, null, indent)
+	console.log(str)
+}
diff --git a/exercises/07_unit_testing/otherScripts/objectMethods.js b/exercises/07_unit_testing/otherScripts/objectMethods.js
new file mode 100755
index 00000000..4b5ef0b1
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/objectMethods.js
@@ -0,0 +1,54 @@
+#!/usr/bin/env node
+/* eslint no-magic-numbers: 0 */
+
+'use strict'
+
+const fiat = {
+	make: 'Fiat',
+	model: '500',
+	year: 1957,
+	color: 'Medium Blue',
+	passengers: 2,
+	convertible: false,
+	mileage: 88000,
+	fuel: 0,
+	started: false,
+	start: function() {
+		console.log('trying to start car...')
+		if (this.fuel === 0) {
+			console.log('The car is on empty, fill up before starting!')
+		} else {
+			console.log('car started')
+			this.started = true
+		}
+	},
+	stop: function() {
+		console.log('car stopping...')
+		this.started = false
+	},
+	drive: function() {
+		if (this.started) {
+			if (this.fuel > 0) {
+				console.log(this.make+' '+this.model + ' goes zoom zoom!')
+				this.fuel = this.fuel - 1
+			} else {
+				console.log('Uh oh, out of fuel.')
+				this.stop()
+			} 
+		} else {
+			console.log('You need to start the engine first.')
+		}
+	},
+	addFuel: function(amount) {
+		console.log('adding '+amount+' units of fuel')
+		this.fuel = this.fuel+amount
+	}
+}
+
+fiat.start()
+fiat.drive()
+fiat.addFuel(2)
+fiat.start()
+fiat.drive()
+fiat.drive()
+fiat.drive()
diff --git a/exercises/07_unit_testing/otherScripts/promiseLoop.js b/exercises/07_unit_testing/otherScripts/promiseLoop.js
new file mode 100644
index 00000000..767d9853
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/promiseLoop.js
@@ -0,0 +1,57 @@
+'use strict'
+
+const readline = require('readline-sync')
+const request = require('request')
+const cheerio = require('cheerio')
+
+const author = String(readline.question('author name: ')).trim()
+
+getQuotes(author, (err, data) => {
+	try {
+		if (err) throw err
+		console.log(data)
+	} catch(err) {
+		console.log(`ERROR: ${err.message}`)
+	}
+})
+
+console.log('EOF')
+
+function getQuotes(author, callback) {
+	const page = 1
+	scraper(author, page, (err, data) => {
+		if (err) return callback(err)
+		return callback(null, data)
+	})
+}
+
+function getPageCount(author) {
+	const pageCount = 10
+	return new Promise( (resolve, reject) => {
+		const url = `http://www.quotationspage.com/search.php3?startsearch=Search&homesearch=${author}`
+		request.get(url, (err, res, body) => {
+			if (err) reject(new Error('page access error'))
+			const $ = cheerio.load(body, {decodeEntities: false})
+			if ($('p:contains("No quotations found")').length) reject(new Error('invalid name'))
+			const quoteCount = $('small').text().match(/\d+/g).pop()
+			const pages = Math.ceil(quoteCount / pageCount)
+			resolve(pages)
+		})
+	})
+}
+
+function getQuotes(author, page) {
+	return new Promise((resolve, reject) => {
+		const url = `http://www.quotationspage.com/search.php3?startsearch=Search&homesearch=${author}&page=${page}`
+		request.get(url, (err, res, body) => {
+			if (err) reject(new Error('page access error'))
+			const $ = cheerio.load(body, {decodeEntities: false})
+			if ($('p:contains("No quotations found")').length) reject(new Error('invalid name'))
+			const quotes = []
+			$('dt.quote > a').each(function(i, element) {
+				quotes.push(element.children[0].data)
+			})
+			resolve(quotes)
+		})
+	})
+}
diff --git a/exercises/07_unit_testing/otherScripts/promisesAll.js b/exercises/07_unit_testing/otherScripts/promisesAll.js
new file mode 100644
index 00000000..2c579bbe
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/promisesAll.js
@@ -0,0 +1,51 @@
+
+'use strict'
+
+const request = require('request')
+
+const getInput = prompt => new Promise( (resolve) => {
+	process.stdin.resume()
+	process.stdin.setEncoding('utf8')
+	process.stdout.write(`${prompt}: `)
+	process.stdin.on('data', text => resolve(text))
+})
+
+const checkValidCurrencyCode = code => new Promise( (resolve, reject) => {
+	code = code.trim()
+	request('http://api.fixer.io/latest', (err, res, body) => {
+		if (err) reject(new Error('invalid API call'))
+		const rates = JSON.parse(body).rates
+		if (!rates.hasOwnProperty(code)) reject(new Error(`invalid currency code ${code}`))
+		resolve(code)
+	})
+})
+
+const exit = () => new Promise( () => {
+	process.exit()
+})
+
+getInput('enter base currency')
+	.then(checkValidCurrencyCode)
+	.then( base => {
+		this.base = base
+		this.itemPromises = ['USD', 'HKD'].map( curr => new Promise((resolve, reject) => {
+			const url = `http://api.fixer.io/latest?base=${this.base}&symbols=${curr}`
+			request.get(url, (err, res, body) => {
+				if (err) reject(new Error(`could not get conversion rate for ${base}`))
+				resolve(body)
+			})
+		}))
+	})
+	.then( () => Promise.all(this.itemPromises))
+	.then( results => results.forEach( item => console.log(item)))
+	.then(exit)
+	.catch( err => console.log(`error: ${err.message}`))
+	.then(exit)
+
+// const itemPromises = ['USD', 'GBP'].map( base => new Promise((resolve, reject) => {
+// 	const url = `http://api.fixer.io/latest?symbols=${base}`
+// 	request.get(url, (err, res, body) => {
+// 		if (err) reject(new Error(`could not get conversion rate for ${base}`))
+// 		resolve(body)
+// 	})
+// }))
diff --git a/exercises/07_unit_testing/otherScripts/promisesRace.js b/exercises/07_unit_testing/otherScripts/promisesRace.js
new file mode 100644
index 00000000..8e721dba
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/promisesRace.js
@@ -0,0 +1,29 @@
+
+'use strict'
+
+const request = require('request')
+
+const itemPromises = ['USD', 'GBP'].map( base => new Promise((resolve, reject) => {
+	const url = `http://api.fixer.io/latest?symbols=${base}`
+
+	console.log(url)
+	request.get(url, (err, res, body) => {
+		if (err) reject(new Error(`could not get conversion rate for ${base}`))
+		resolve(body)
+	})
+}))
+
+Promise.race(itemPromises)
+	.then( result => {
+			 console.log(result)
+	}).catch( err => {
+		console.log(`error: ${err.message}`)
+	})
+
+const orig = [1, 2, 3, 4, 5, 6]
+const res = orig
+	.filter( num => num % 2 === 0)
+	.map( num => num * num)
+	.reduce( (acc, val) => acc + val, 10)
+
+console.log(res)
diff --git a/exercises/07_unit_testing/otherScripts/weather.js b/exercises/07_unit_testing/otherScripts/weather.js
new file mode 100644
index 00000000..f071f61a
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/weather.js
@@ -0,0 +1,30 @@
+
+const readline = require('readline-sync')
+const request = require('request')
+const url = 'http://api.openweathermap.org/data/2.5/weather'
+
+const location = String(readline.question('location: ')).trim()+',GB' //otherwise defaults to the US...
+const query_string = {q: location, units: "metric", appid: "44c39f3fa462f86b3fc88f5678e5c5ff"}
+request.get({url: url, qs: query_string}, (err, res, body) => {
+	try {
+		if (err) {
+			throw err
+		} else {
+			//console.log(body)
+			const json = JSON.parse(body)
+			if (json.cod !== 200) { // test with xxxxxxxxxxxxxxxxxxxx
+				throw 'location not found'
+			}
+			const pretty = JSON.stringify(json, null, 2)
+			console.log('STATUS CODE: '+res.statusCode)
+			console.log(pretty)
+			console.log('################')
+			console.log(json.name)
+			console.log(json.sys.country)
+			console.log(json.weather[0].description)
+			console.log('################')
+		}
+	} catch(err) {
+		console.log(err)
+	}
+})
diff --git a/exercises/07_unit_testing/otherScripts/webWorker.js b/exercises/07_unit_testing/otherScripts/webWorker.js
new file mode 100644
index 00000000..ece70fee
--- /dev/null
+++ b/exercises/07_unit_testing/otherScripts/webWorker.js
@@ -0,0 +1,18 @@
+
+'use strict'
+
+const Worker = require('webworker-threads').Worker
+
+const worker = new Worker( () => {
+	this.postMessage('sending a message from inside the worker')
+	this.onmessage = event => {
+		console.log(`received message from main thread: ${event.data}`)
+		this.close()
+	}
+})
+
+worker.onmessage = event => {
+	console.log(`received message from worker: ${event.data}`)
+}
+
+worker.postMessage('sending message from main thread')
diff --git a/exercises/07_unit_testing/todo/modules/todo.js b/exercises/07_unit_testing/todo/modules/todo.js
index 5a034683..f4fdd7b8 100644
--- a/exercises/07_unit_testing/todo/modules/todo.js
+++ b/exercises/07_unit_testing/todo/modules/todo.js
@@ -9,7 +9,7 @@ module.exports.clear = () => {
 
 module.exports.add = (item, qty) => {
 	qty = Number(qty)
-	if(isNaN(qty)) throw new Error('the quantity must be a number')
+	if(isNaN(qty)) throw new Error('qty must be a number')
 	data.push({item: item, qty: qty})
 }