HackYourFuture · mkruijt · Dec 17, 2017 · Dec 14, 2017 · Dec 14, 2017 · Dec 14, 2017
diff --git a/README.md b/README.md
@@ -4,24 +4,24 @@
 
 Here you can find course content and homework for the JavaScript 1,2 and 3 modules
 
-|Week|Topic|Read|Homework|Review|
-|----|-----|----|--------|------|
-|0.|Preparation for your first JavaScript session|[Pre-reading](/Week0/README.md)|-|-|
-|1.|Git Session with Unmesh|[Reading Week 1](/Week1/README.md) | [Homework Week 1](/Week1/MAKEME.md)|[Review](/Week1/REVIEW.md)|
-|2.|• Intro JavaScript (What is it, where can you use it for)<br>• Variables [var, let, const]<br>• Basic Data types [Strings, Numbers, Arrays, Booleans]<br>• Operators <br>• Naming conventions|[Reading Week 2](/Week2/README.md)|[Homework Week 2](/Week2/MAKEME.md)|[Review](/master/Week2/REVIEW.md)|
-|3.|• Git work flow :smiling_imp:<br>• Advanced data types [Objects] <br>• Conditions <br>• Statements vs Expressions<br> • Loops (for/while)<br>• Functions <br>• Scope|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|[Review](/Week3/REVIEW.md)|
-|4.|• Capturing user input <br>• Events • Basic DOM manipulations[img src, innerHTML] <br>• Code debugging using the browser <br>• Code commenting <br>• Structuring code files |[Reading Week 4](/Week4/README.md)|[Homework Week 4](/Week4/MAKEME.md)|Review|
-|5.|• Functions + JSON/Arrays<br>• Array Manipulations<br>• JSON<br>• Map and filter<br>• Arrow functions |[Reading Week 5](/Week5/README.md)|[Homework Week 5](/Week5/MAKEME.md)|[Review](/Week5/REVIEW.MD)|
-|6.|• Closures <br>• Callbacks|[Reading Week 6](/Week6/README.md)|[Homework Week 6](/Week6/MAKEME.md)|[Review](/Week6/REVIEW.md)|
-|7.|• Object Oriented Programming  <br>• Code flow (order of execution) <br>• Async VS Sync|[Reading Week 7](/Week7/README.md)|[Homework Week 7](/Week7/MAKEME.md)|[Review](/Week7/REVIEW.md)|
-|8.|• Structure for a basic SPA <br>• XHTTP Requests <br>• API calls|[Reading Week 8](/Week8/README.md)|[Homework Week 8](/Week8/MAKEME.md)|Review|
-|9.|• (re)writing data structures (in JSON) <br>• Promises|[Reading Week 9](/Week9/README.md)|[Homework Week 9](/Week9/MAKEME.md)|[Review](/Week9/REVIEW.md)|
+|Week|Topic|Read|Homework|
+|----|-----|----|--------|
+|0.|Preparation for your first JavaScript session|[Pre-reading](/Week0/README.md)|-|
+|1.|Git Session with Unmesh|[Reading Week 1](/Week1/README.md) | [Homework Week 1](/Week1/MAKEME.md)|
+|2.|• Intro JavaScript (What is it, where can you use it for)<br>• [Variables (var, let, const)](fundamentals/variables.md)<br>• [Basic Data types (Strings, Numbers, Arrays, Booleans)](fundamentals/values.md)<br>• [Operators](fundamentals/operators.md)<br>• [Naming conventions](fundamentals/naming_conventions.md)|[Reading Week 2](/Week2/README.md)|[Homework Week 2](/Week2/MAKEME.md)|
+|3.|• Git work flow :smiling_imp:<br>• [Advanced data types (objects)](fundamentals/objects.md) <br>• [Conditional execution](fundamentals/conditional_execution.md) <br>• [Statements vs Expressions](fundamentals/statements_expressions.md)<br> • [Loops (for/while)](fundamentals/loops.md)<br>• [Functions](fundamentals/functions.md) <br>• [Scope](fundamentals/scope.md)|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
+|4.|• Capturing user input <br>• Events<br>• [Basic DOM manipulations (img src, innerHTML)](fundamentals/DOM_manipulation.md)<br>• Code debugging using the browser <br>• [Code commenting](fundamentals/code_commenting.md)<br>• Structuring code files |[Reading Week 4](/Week4/README.md)|[Homework Week 4](/Week4/MAKEME.md)|
+|5.|• Functions + JSON/Arrays<br>• [Array Manipulations](fundamentals/array_manipulation.md)<br>• JSON<br>• [Map and filter](fundamentals/map_filter.md)<br>• Arrow functions |[Reading Week 5](/Week5/README.md)|[Homework Week 5](/Week5/MAKEME.md)|
+|6.|• [Closures](fundamentals/scope_closures_this.md) <br>• Callbacks|[Reading Week 6](/Week6/README.md)|[Homework Week 6](/Week6/MAKEME.md)|
+|7.|• Object Oriented Programming  <br>• Code flow (order of execution) <br>• Async vs Sync|[Reading Week 7](/Week7/README.md)|[Homework Week 7](/Week7/MAKEME.md)|
+|8.|• Structure for a basic SPA (Single Page Application) <br>• [XMLHttpRequests](fundamentals/XMLHttpRequest.md) <br>• API calls|[Reading Week 8](/Week8/README.md)|[Homework Week 8](/Week8/MAKEME.md)|
+|9.|• (re)writing data structures (in JSON) <br>• [Promises](fundamentals/promises.md)|[Reading Week 9](/Week9/README.md)|[Homework Week 9](/Week9/MAKEME.md)|
 
 __Kind note:__
 
 We expect you to __always__ come prepared to the class on Sunday.
 
 ### Overall
-A good understanding of all the above mentioned topics. Want to check your Knowledge? Go through the [JavaScript Fundamentals README](/fundamentals) and research/ ask for help (Slack!) with the concepts that are not entirely clear. 
+A good understanding of all the above mentioned topics. Want to check your Knowledge? Go through the [JavaScript Fundamentals README](fundamentals/README.md) and research/ ask for help (Slack!) with the concepts that are not entirely clear.
 
 
diff --git a/Week2/MAKEME.md b/Week2/MAKEME.md
@@ -3,29 +3,29 @@
 ```
 Topics discussed in class this week:
 • Intro JavaScript (What is it, where can you use it for)
-• Variables [var, let, const]
-• Basic Data types [Strings, Numbers, Arrays, Booleans]
+• Variables (var, let, const)
+• Basic Data types (Strings, Numbers, Arrays, Booleans)
 • Operators
 ```
 
 >[Here](/Week1/README.md) you find the readings you have to complete before the second lecture.
 
 ## Before you start with the homework:
 
-1. Go through the review of [week 1](https://github.com/HackYourFuture/JavaScript/blob/master/Week1/REVIEW.md)
+1. Review the [Git course material](https://github.com/HackYourFuture/Git) of last week.
 2. Watch: [What is programming](https://www.khanacademy.org/computing/computer-programming/programming/intro-to-programming/v/programming-intro) Just watch the 2 min video, you do not have to do the entire JavaScript course (It could be useful later on though). 
-3. Please watch the following parts of the course, [Programming Foundations Fundamentals](https://www.lynda.com/Programming-Foundations-tutorials/Welcome/83603/90426-4.html) on Lynda.com (if you don't have access to Lynda yet ask Gijs):
-    <br>0. Introduction
-    1. Programming Basics
-    2. Core Programming Syntax 
-    3. Variables and Data Types
+3. Please watch the following parts of the course, [Programming Foundations Fundamentals](https://www.lynda.com/Programming-Foundations-tutorials/Welcome/83603/90426-4.html) on Lynda.com (if you don't have access to Lynda yet ask Gijs):    
+    0\. Introduction    
+    1\. Programming Basics    
+    2\. Core Programming Syntax   
+    3\. Variables and Data Types    
 
 
 ## Step 2: Feedback
 
 _Deadline Wednesday_
 
-Provide feedback on the HTML-CSS assignments (week 3) of one of your fellow students. You will be assigned to one of the assignments by the class lead of this week.
+Provide feedback on the Git assignments (week 1) of one of your fellow students. You will be assigned to one of the assignments by the class lead of this week.
 
 ## Step 3: JavaScript
 
@@ -42,22 +42,24 @@ Ciao, mondo! // Italian
 Hola, mundo! // Spanish
 ```
 
-2\. Consider the following code:  
+2\. Consider the following code:
+
 ```
 console.log('I'm awesome');
 ```
-2\.1 Copy the code in your `.js` file and run it. You will see that you will get a SyntaxError. Find a solution for this error, Hint read the error message carefully, it also gives an indication of where the problem is.
 
-3\. Declare a variable `x` and initialize it with an integer.    
-3\.1 First, _declare_ your variable `x`.  
+Copy the code in your `.js` file and run it. You will see that you will get a SyntaxError. Find a solution for this error. Hint: read the error message carefully, it also gives an indication of where the problem is.
+
+3\. Declare a variable `x` and initialize it with an integer, using these exact steps:    
+3\.1 First, _declare_ your variable `x` (do not initialize it yet).  
 3\.2 Add a console.log statement that explains that explains in words what _you think_ the value of `x` is, like in this example:
 ```js
   // TODO -> here you initialize your variable
   console.log('the value of my variable x will be: whateverYouThinkItWillLog');
 ```
 3\.3 Add a console.log statement that logs the value of `x`.  
 3\.4 Now _initialize_ your variable `x` with an integer.  
-3\.5 Now add a console.log statement that explains what _you think_ the value of `x` is.  
+3\.5 Next, add a console.log statement that explains what _you think_ the value of `x` is.  
 3\.6 Add a console.log statement that logs the value of `x`.
   Steps to be taken:
 
@@ -85,7 +87,7 @@ console.log('I'm awesome');
   // TODO -> log the actual value of the string to the console
 ```
 
-5\. How do you round the number 7.25, to the nearest integer?  
+5\. How do you round the number 7.25, to the nearest integer (i.e., whole number)?  
 5\.1 Declare a variable `z` and assign the number 7.25 to it.  
 5\.2 Console.log `z`.  
 5\.3 Declare another variable `a` that has the value of z but rounded to the nearest integer.  
@@ -94,16 +96,16 @@ console.log('I'm awesome');
 5\.6 Console.log the highest value.  
 
 6\. *Arrays!*  
-6\.1 Declare an empty array.  
+6\.1 Declare an empty array. Make sure that the name you choose indicates 'plurality', because an array is capable of containing more than one element. (See [Naming conventions](../fundamentals/naming_conventions.md).)   
 6\.2 Write a console.log statement that explains in words what you think the value of the array is.  
 6\.3 Console.log your array.  
-6\.4 Create an array that has your favorite animals inside (you can decide on how to call it yourself, but read on a bit here and see if you can find a good name that exactly describes what this variable will hold).
+6\.4 Create an array that has your favorite animals inside (see if you can find a good name that exactly describes what this variable will hold).    
 6\.5 Log your array.  
-6\.6 Add a statement that adds Daan's favorite animal (baby pig) to the *existing array*.  
+6\.6 Add a statement that adds Daan's favorite animal ('baby pig') to the *existing array*.  
 6\.7 Log your new array!  
 
 7\. *More strings*  
-7\.1 Let's consider the following string: `let myString = "this,is,a,test"`.  
+7\.1 Let's consider the following string: `let myString = "this is a test"`.  
 7\.2 Add the string to your file and console.log it.  
 7\.3 Find a way to get the length of `myString`.  
 7\.4 Console.log the length of `myString`.  
@@ -115,6 +117,9 @@ console.log('I'm awesome');
   let foo = 3;
   console.log('The value of my variable foo is: ' + foo);
   ```
+
+  (Curious to know what a `foo` is? Check [this article](https://en.wikipedia.org/wiki/Metasyntactic_variable) on WikiPedia.)  
+
 8\.3 Now write a console.log statement wherein you first explain in words what you think the _type_ of your variables is.  
 8\.4 Now use `typeof` to log the actual _type_ of your variables.  
 8\.5 Now compare the types of your different variables with one another.  
@@ -126,7 +131,7 @@ For example:
 let x = 9;
 let y = 'Hello';
 
-if () {
+if (...) {
     console.log('SAME TYPE');
 }
 // TODO -> add a way of giving feedback if your variables don't have the same type
@@ -150,7 +155,7 @@ On freeCodeCamp.com please do the [Basic JavaScript](https://www.freecodecamp.co
 
 _Deadline Sunday morning_
 
-Go trough the reading material in the [README.md](/Week1/README.md) to prepare for your next class
+Go trough the reading material in the [README.md](/Week2/README.md) to prepare for your next class
 
 ### How to hand in Homework:
 ```
@@ -163,4 +168,9 @@ Go trough the reading material in the [README.md](/Week1/README.md) to prepare f
 ### Hint
 If you solve the FreeCodeCamp challenges and they are new concepts to you and you would like to take a look at them later on in the program, Copy your answers from FCC in a `.js` file and upload them to Github in a repository for future reference. In this way you build your own little documentation, if you look back at them first try to understand what it does before you run them.
 
-:star: Additional resources and review: [here](/Week1/REVIEW.md):star:
+:star: Additional resources and review: :star:
+
+- [Variables](../fundamentals/variables.md)
+- [Basic value types](../fundamentals/values.md)
+- [Operators](../fundamentals/operators.md)
+- [Naming conventions](../fundamentals/naming_conventions.md)
diff --git a/Week2/README.md b/Week2/README.md
@@ -35,7 +35,12 @@ Please watch the following parts of the course, [Programming Foundations Fundame
 - Check out this video of Daan to see how we use Git Workflow to hand in Homework (from now on): https://www.youtube.com/watch?v=-o0yomUVVpU&index=2&list=PLVYDhqbgYpYUGxRdtQdYVE5Q8h3bt6SIA
 
 ### Review
-- Go through the review of [week 1](/Week1/REVIEW.md)
-- Go through the review of [week 2](/Week2/REVIEW.md)
+
+Review the topics of week 2:
+
+- [Variables](../fundamentals/variables.md)
+- [Values](../fundamentals/values.md)
+- [Operators](../fundamentals/operators.md)
+- [Naming conventions](../fundamentals/naming_conventions.md)
 
 _Please go through the material and come to class prepared!_
diff --git a/Week2/REVIEW.md b/Week2/REVIEW.md