diff --git a/package-lock.json b/package-lock.json
index d663c98a..6751df13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "js-fundamentals",
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
diff --git a/spec/data-types/objects/objects-and-arrays.spec.js b/spec/data-types/objects/objects-and-arrays.spec.js
index 8b7d86fb..d696210c 100644
--- a/spec/data-types/objects/objects-and-arrays.spec.js
+++ b/spec/data-types/objects/objects-and-arrays.spec.js
@@ -12,7 +12,7 @@ describe('Objects and Arrays:', () => {
   it('The price of apples should be updated to 2', () => {
     expect(answers.basket.items[0].price).toEqual(2)
   })
-
+-
   it('4 oranges priced at 0.75 should be added to the end of the items list', () => {
     expect(answers.basket.items[2]).toEqual({
       name: "Oranges",
diff --git a/src/conditional-flow/boolean-conditions.js b/src/conditional-flow/boolean-conditions.js
index 70b623d4..9c5d85c4 100644
--- a/src/conditional-flow/boolean-conditions.js
+++ b/src/conditional-flow/boolean-conditions.js
@@ -2,10 +2,18 @@
 // "Well done, you passed!" if the value is true, or "Sorry, try again"
 // if the value is false.
 function getResult (didPass) {
+  if (didPass) {
+    return "Well done, you passed!"
+  }
+  else {
+    return "Sorry, try again"
+  }
+
+}
 
   // TODO: write code in this function body to pass the tests
 
-}
+
 
 module.exports = {
   a: getResult
diff --git a/src/conditional-flow/multiple-conditions.js b/src/conditional-flow/multiple-conditions.js
index 80420abf..4aecef07 100644
--- a/src/conditional-flow/multiple-conditions.js
+++ b/src/conditional-flow/multiple-conditions.js
@@ -2,19 +2,30 @@
 // than or equal to lower AND less than or equal to upper.
 // Implement this with a single condition.
 function isInRange (num, lower, upper) {
-
+  if (num>=lower && num<=upper) {
+    return true;
+  }
+  else {
+    return false;
+  }
+}
   // TODO: write code in this function body to pass the tests
 
-}
+
 
 // This function should return true if the passed string is equal
 // to "Hello" or "Goodbye". Implement this with a single
 // if statement.
 function isHelloOrGoodbye (val1) {
+ if (val1 === "Hello" || val1 === "Goodbye") {
+   return true
+ }
+ return false
 
+}
   // TODO: write code in this function body to pass the tests
 
-}
+
 
 // This function should return a string that describes the provided age value. The
 // table below shows for each range of age values what string should be returned.
@@ -28,10 +39,28 @@ function isHelloOrGoodbye (val1) {
 // 5-12   | Child
 // 13-19  | Teenager
 // 20+    | Adult
+
 function getAgeDescription (age) {
+  if (age === 0) {
+    return "Baby"
+  }
+  else if (age >= 1 && age <= 4) {
+    return "Toddler"
+  }
+  else if (age >= 5 && age <=12) {
+    return "Child"
+  }
+  else if (age > 12 && age < 20) {
+    return "Teenager"
+  }
+  else {
+    return "Adult"
+  }
+}
+
 
   // TODO: write code in this function body to pass the tests
-}
+
 
 module.exports = {
   a: isInRange,
diff --git a/src/conditional-flow/numeric-conditions.js b/src/conditional-flow/numeric-conditions.js
index 0f6656a5..ecd4c216 100644
--- a/src/conditional-flow/numeric-conditions.js
+++ b/src/conditional-flow/numeric-conditions.js
@@ -2,24 +2,50 @@
 
 // This function should return true if there are no elements in the array, false otherwise
 function isArrayEmpty (array) {
+  if (array.length === 0) {
+    return true
+  } 
+  else {
+    return false
+  }
+}
 
   // TODO: write code in this function body to pass the tests
 
-}
+
 
 // This function should return true if num1 is greater than num2, false otherwise
 function isGreaterThan (num1, num2) {
+  if (num1 > num2) {
+    return true
+  }
+  else {
+    return false
+  }
+}
 
   // TODO: write code in this function body to pass the tests
 
-}
+
 
 // This function should return the lowest number in the passed array
+
+
 function findLowest (nums) {
+  let smallest = nums[0]
+  for (let i = 1; i < nums.length; i++) {
+    if (nums[i] < smallest) {
+      smallest = nums[i]
+    }
+ }
+ return smallest
+}
+
+
 
   // TODO: write code in this function body to pass the tests
 
-}
+
 
 module.exports = {
   a: isArrayEmpty,
diff --git a/src/conditional-flow/string-conditions.js b/src/conditional-flow/string-conditions.js
index d91bfaf0..d5faa47b 100644
--- a/src/conditional-flow/string-conditions.js
+++ b/src/conditional-flow/string-conditions.js
@@ -1,20 +1,39 @@
 // This function should return true if the passed string is equal to "Hello"
 function isHello (val1) {
+  if (val1 === "Hello"){
+    return true
+  }
+  if (val1 !== "Hello") {
+    return false
+  }
+}
 
   // TODO: write code in this function body to pass the tests
 
-}
 
 // This function should return true if the passed string is not equal to "Hello"
 function isNotHello (val1) {
-
+  if (val1 !== "Hello") {
+    return true
+  }
+  if (val1 === "Hello") {
+    return false
+  }
+}
   // TODO: write code in this function body to pass the tests
 
-}
 
 // This function should return true if the string val1 is is longer
 // than string val2
+
 function isLongerThan (val1, val2) {
+  if (val1.length > val2.length) {
+    return true
+  }
+  else {
+    return false
+  }
+
 
   // TODO: write code in this function body to pass the tests
 
@@ -24,20 +43,46 @@ function isLongerThan (val1, val2) {
 // argument has an odd number of vowels
 
 function hasOddNumberVowels (val1) {
+  const vowels = ["a", "e", "i", "o", "u", "A", "E", "I", "O", "U"];
+  let vowelsInString = 0;
+  for (let i=0; i<val1.length; i++){
+    if (vowels.includes(val1[i])) {
+      vowelsInString++
+    }
+  }
+  return Boolean(vowelsInString % 2);
+}
+
+  
+
+
 
+    
   // TODO: write code in this function body to pass the tests
 
-}
+
 
 // this function should return the middle character of a string if it has an odd number
 // of characters. If there are an even number of characters the function should return
 // the middle two letters
 
 function getMiddleLetter (val1) {
-  // TODO: write code in this function body to pass the tests
-
+  if (val1.length % 2 === 1) {
+    let half = val1.length / 2;
+    let mid = Math.floor(half);
+    return val1[mid];
+  }
+  if (val1.length % 2 === 0) {
+    let middleTwo = val1.length / 2;
+    let middleOne = middleTwo - 1;
+    return  val1[middleOne] + val1[middleTwo];
+}
 }
 
+ 
+
+ // TODO: write code in this function body to pass the tests
+
 // This function should return the name of the season for the provided
 // month name. For example, "January" should return "Winter". If the provided
 // value is not a valid month, an empty string ("") should be returned. Use
@@ -47,10 +92,38 @@ function getMiddleLetter (val1) {
 // Summer - June to August
 // Autumn - September to November
 // Winter - December to February
+
 function seasonForMonth (monthName) {
+  switch (monthName) {
+    case "March":
+    case "April":
+    case "May":
+      season = "Spring"
+      break;
+    case "June":
+    case "July":
+    case "August":
+      season = "Summer"
+      break;
+    case "September":
+    case "October":
+    case "November":
+      season = "Autumn"
+      break;
+    case "December":
+    case "January":
+    case "February":
+      season = "Winter"
+      break;
+    default:
+      season = ""
+  }
+  return season;
+}
 
+
+  
   // TODO: write code in this function body to pass the tests
-}
 
 module.exports = {
   a: isHello,
diff --git a/src/data-types/arrays/accessing-elements.js b/src/data-types/arrays/accessing-elements.js
index 374a19bb..db2ed5b5 100644
--- a/src/data-types/arrays/accessing-elements.js
+++ b/src/data-types/arrays/accessing-elements.js
@@ -4,16 +4,17 @@ const cities = ['London', 'Shanghai', 'New York', 'Delhi', 'Kuala Lumpur']
 // TODO: write code to pass the tests
 
 // Set names equal to an array containing 'Bob', 'Jane', 'Joanna' in that order
-const names = null
+const names = ["Bob", "Jane", "Joanna"]
 
 // Set fourthCity to the 4th element in the cities array
-const fourthCity = ''
+const fourthCity = cities[3]
 
 // Set firstCity to the 1st element in the cities array
-const firstCity = ''
+const firstCity = cities[0]
 
 // Set lengthOfCitiesArray to the length of the cities array
-const lengthOfCitiesArray = NaN
+const lengthOfCitiesArray = cities.length
+
 
 // Do not edit this exported object
 module.exports = {
diff --git a/src/data-types/arrays/adding-removing-elements.js b/src/data-types/arrays/adding-removing-elements.js
index 69e559e8..8a0ba527 100644
--- a/src/data-types/arrays/adding-removing-elements.js
+++ b/src/data-types/arrays/adding-removing-elements.js
@@ -10,25 +10,25 @@ const fruits = ['Apple', 'Orange', 'Pear']
 // TODO: write code to pass the tests
 
 // Edit this code to add 'Fred' to the names array
-names.push(undefined)
+names.push("Fred")
 
 // Edit this code to add 4 to the end of the numbers array
-numbers.push(NaN)
+numbers.push(4)
 
 // Edit this code to add 'Rio' to the start of the cities array
-cities.unshift(undefined)
+cities.unshift("Rio")
 
 // Use an array method to remove the first item from colours
-colours
+colours.shift()
 
 // Use an array method to remove the last item from keys
-keys
+keys.pop()
 
 // Use an array method to remove 'Jordon' from the countries array
-countries.splice(NaN, NaN)
+countries.splice(1, 1)
 
 // use an array method to remove the last item from the fruits array and store the value in the pear variable
-const pear = fruits.undefined
+const pear = fruits.pop()
 
 // Do not edit this exported object
 module.exports = {
diff --git a/src/data-types/numbers.js b/src/data-types/numbers.js
index 01dd70de..8ec2eaa6 100644
--- a/src/data-types/numbers.js
+++ b/src/data-types/numbers.js
@@ -6,22 +6,22 @@ const numThree = 32
 // TODO: Add code below using Javascript numeric operators so that the tests pass
 
 // Set this variable to numOne added to numTwo
-const numOnePlusNumTwo = NaN
+const numOnePlusNumTwo = numOne + numTwo
 
 // Set this variable to numThree multiplied by numTwo
-const numThreeTimesNumTwo = NaN
+const numThreeTimesNumTwo = numThree * numTwo
 
 // Set this variable to numThree divided by numOne
-const numThreeDividedByNumOne = NaN
+const numThreeDividedByNumOne = numThree / numOne
 
 // Set this variable to numThree minus numOne
-const numThreeMinusNumOne = NaN
+const numThreeMinusNumOne = numThree - numOne
 
 // Set this variable to the sum of numOne, numTwo and numThree
-const sum = NaN
+const sum = numOne + numTwo + numThree
 
 // Set this variable to the sum of (numOne, numTwo, numThree) divided by numOne
-const numBytes = NaN
+const numBytes = (numOne + numTwo + numThree) / numOne
 
 // do not edit the exported object.
 module.exports = {
diff --git a/src/data-types/objects/creating-objects.js b/src/data-types/objects/creating-objects.js
index 1939e6b0..656fce40 100644
--- a/src/data-types/objects/creating-objects.js
+++ b/src/data-types/objects/creating-objects.js
@@ -1,10 +1,31 @@
 // TODO: write code in this section to pass the tests. You will need to add new code
 // as well as modify some of the existing code
-const person = null
-const computer = null
+// Person should be an object with the name "Jane"
+//Person should be an object with the age 32'
+//Computer should be an object with the form "laptop"
+//Computer.specs should be an object with a memory "16GB" and storage "1TB"
+
+
+const person = {
+  name: "Jane",
+  age: 32
+}
+
+const computer =  {
+  form: "laptop",
+  specs: {
+    memory: "16GB",
+    storage: "1TB"
+  }
+}
+
 
 // Do not edit this exported object
 module.exports = {
   person: person,
   computer: computer
 }
+
+
+
+
diff --git a/src/data-types/objects/object-keys.js b/src/data-types/objects/object-keys.js
index 4999e940..5a90f3d0 100644
--- a/src/data-types/objects/object-keys.js
+++ b/src/data-types/objects/object-keys.js
@@ -17,10 +17,10 @@ const isbn13 = '978-0132350884'
 // as well as modify some of the existing code
 
 // Set this to the book name
-const name = ''
+const name = book.name
 
 // Set this to the isbn 10 value
-const isbn10 = ''
+const isbn10 = book.isbn.isbn10
 
 // Do not edit this exported object
 module.exports = {
@@ -28,3 +28,21 @@ module.exports = {
   isbn10: isbn10,
   book: book
 }
+
+// Book category should be Programming
+book.category = "Programming"
+
+//Book pages should be 464
+book.pages = 464
+
+//Book ISBN 13 should be 978-0132350884
+book.isbn.isbn13 = "978-0132350884"
+
+//Book should not contain the dimensions key - it should be deleted
+delete book.dimensions
+
+//Book should not contain the asin key - it should be deleted
+delete book.isbn.asin
+
+
+
diff --git a/src/data-types/objects/objects-and-arrays.js b/src/data-types/objects/objects-and-arrays.js
index e4819467..95de6405 100644
--- a/src/data-types/objects/objects-and-arrays.js
+++ b/src/data-types/objects/objects-and-arrays.js
@@ -22,10 +22,20 @@ const basket = {
 // as well as modify some of the existing code
 
 // Set this variable to the length of the baskets voucher codes array
-const numberOfVoucherCodes = null
+const numberOfVoucherCodes = basket.voucherCodes.length
 
 // Set this variable to the first element in of the baskets voucher codes array
-const firstVoucherCode = null
+const firstVoucherCode = basket.voucherCodes[0]
+
+//The price of apples should be updated to 2
+basket.items[0].price = 2
+
+//4 oranges priced at 0.75 should be added to the end of the items list
+basket.items.push({
+  name: "Oranges",
+  price: 0.75,
+  quantity: 4,
+});
 
 // Do not edit this exported object
 module.exports = {
diff --git a/src/data-types/strings.js b/src/data-types/strings.js
index a8eb8c5b..1f39e826 100644
--- a/src/data-types/strings.js
+++ b/src/data-types/strings.js
@@ -6,16 +6,16 @@ const secondName = 'Smith'
 // TODO: Update the code using Javascript string operations and the variables above so that the tests pass.
 
 // Set this variable to firstName and secondName concatenated
-const fullName = null
+const fullName = firstName + " " + secondName
 
 // Set this variable to the 10th character of the alphabet variable
-const tenthCharacterOfAlphabet = null
+const tenthCharacterOfAlphabet = alphabet.charAt(9)
 
 // Set this variable by calling a method on the alphabet variable to transform it to lower case
-const lowerCaseAlphabet = null
+const lowerCaseAlphabet = alphabet.toLowerCase()
 
 // Set this variable by using a property on the alphabet variable to get it's length
-const numberOfLettersInAlphabet = null
+const numberOfLettersInAlphabet = alphabet.length
 
 // do not edit the exported object.
 module.exports = {
diff --git a/src/demo/demo.js b/src/demo/demo.js
index 9201bd8a..c6f97712 100644
--- a/src/demo/demo.js
+++ b/src/demo/demo.js
@@ -4,11 +4,11 @@ const numTwo = 2
 let numThree = 0
 
 // TODO: Update numThree so the tests pass
-numThree = 0
+numThree = 5
 
 // TODO: Update the code below so that the tests pass
 
-const numOnePlusNumTwo = 0 // Set this variable to numOne plus numTwo
+const numOnePlusNumTwo = numOne + numTwo // Set this variable to numOne plus numTwo
 
 // do not edit this section
 module.exports = {
diff --git a/src/functions/calling-functions.js b/src/functions/calling-functions.js
index f44038d6..01007994 100644
--- a/src/functions/calling-functions.js
+++ b/src/functions/calling-functions.js
@@ -19,13 +19,14 @@ function sayHelloManyTimes (name, times) {
 // TODO: Add and update code here to make the tests pass
 
 // Set this variable to 'Hello' by calling the sayHello function
-const hello = ''
+const hello = sayHello ()
+
 
 // Set this variable variable to 'Hello Jane' calling the sayHelloTo function
-const helloToJane = ''
+const helloToJane = sayHelloTo('Jane')
 
 // Set this variable to 'Hello Bob! Hello Bob! Hello Bob!' calling the sayHelloManyTimes function
-const helloToBob3Times = ''
+const helloToBob3Times = sayHelloManyTimes("Bob", 3)
 
 // do not edit below this line
 module.exports = {
diff --git a/src/functions/creating-functions-multiple-args.js b/src/functions/creating-functions-multiple-args.js
index a437ae8a..7a3c43a8 100644
--- a/src/functions/creating-functions-multiple-args.js
+++ b/src/functions/creating-functions-multiple-args.js
@@ -10,6 +10,14 @@
 //
 // TODO: write code below
 
+
+function lowerUpper (lower, upper){
+  let array = []
+  for (let i=lower; i<=upper; i++)
+  array.push(i)
+  return array
+}
+
 // define a function that takes two arguments: a string and a number.
 // The function should return the same string but in upper case with exclamation
 // marks appended to the end. The number of exclamation marks should be
@@ -22,8 +30,19 @@
 //
 // TODO: write code below
 
+
+function myFunction (word, number) {
+  const wordPart = word.toUpperCase()
+  const exclamationPart = []
+  for (i = 0; i < number; i++) {
+    exclamationPart.push("!")
+  }
+return wordPart + exclamationPart.join("")
+}
+
+
 // change the exported value to be the name of the function you defined
 module.exports = {
-  a: undefined, // change undefined to be the name of the function defined to create the range of numbers (the first todo)
-  b: undefined // change undefined to be the name of the function defined to return the string with exclamations (the second todo)
+  a: lowerUpper, // change undefined to be the name of the function defined to create the range of numbers (the first todo)
+  b: myFunction // change undefined to be the name of the function defined to return the string with exclamations (the second todo)
 }
diff --git a/src/functions/creating-functions.js b/src/functions/creating-functions.js
index 2d2ac5e6..ec5800a2 100644
--- a/src/functions/creating-functions.js
+++ b/src/functions/creating-functions.js
@@ -8,6 +8,10 @@
 //
 // TODO: write code below
 
+function increment(number) {
+  return number + 1;
+}
+
 // Define a function that takes any person's name and returns it with a smiley :)!
 // Remember to make the name capitalized!
 //
@@ -19,8 +23,13 @@
 //
 // TODO: write code below
 
+function nameWithSmile (name) {
+  return "Hi, " + name[0].toUpperCase() + name.slice(1) + " :)"
+}
+
+
 // TODO: change undefined to be the name of the functions you defined
 module.exports = {
-  a: undefined, // change undefined to be the name of the function you defined to increment a number (the first TODO)
-  b: undefined // change undefined to be the name of the function you defined to say hi (the second TODO)
+  a: increment, // change undefined to be the name of the function you defined to increment a number (the first TODO)
+  b: nameWithSmile // change undefined to be the name of the function you defined to say hi (the second TODO)
 }
diff --git a/src/loops/for-loop-and-arrays.js b/src/loops/for-loop-and-arrays.js
index 682995ec..8e19c72e 100644
--- a/src/loops/for-loop-and-arrays.js
+++ b/src/loops/for-loop-and-arrays.js
@@ -8,18 +8,39 @@ let word = ''
 // Use a for loop to set the sum variable to the sum of all the values in nums
 sum = 0
 
+for (let i=0; i < nums.length; i++) {
+  sum = sum + nums[i];
+}
+
 // Use a for loop to populate doubledNums with every value from nums array doubled (i.e [2, 6, 24, etc...])
 const doubledNums = []
 
+for (i=0; i<=nums.length-1; i++){
+  doubledNums.push(nums[i]*2);
+}
+
 // Use a for loop to set word equal to all the letters in the letters array
 word = ''
 
+for (i=0; i<letters.length; i++) {
+  word = word + letters[i];
+}
+
 // Use a for loop to populate everySecondNum with every second number from the nums array
 const everySecondNum = []
 
+for (let i = 1; i < nums.length; i += 2) {
+  everySecondNum.push(nums[i])
+}
+
 // Use a for loop to populate numsReversed with the numbers from nums in reverse order
 const numsReversed = []
 
+for (let i=nums.length-1; i>=0; i--) {
+  numsReversed.push(nums[i]);
+}
+
+
 // do not change below this line
 module.exports = {
   a: sum,
diff --git a/src/loops/for-loop-basic.js b/src/loops/for-loop-basic.js
index 38a5c971..572dc541 100644
--- a/src/loops/for-loop-basic.js
+++ b/src/loops/for-loop-basic.js
@@ -4,12 +4,30 @@ const evenNums = []
 const countdown = []
 
 // TODO: Write a for loop that adds the numbers 0 to 3 to the numsZeroToThree array
+for (let i=0; i<4; i++){
+  numsZeroToThree.push(i)
+}
 
 // TODO: Write a for loop that adds the numbers 5 to 10 to the numsFiveToTen array
+for (let i=5; i<11; i++){
+  numsFiveToTen.push(i)
+}
 
 // TODO: Write a for loop that adds all the even numbers between 0 and 6 (0, 2, 4, 6) to evenNums
+for (let i=0; i<7; i++) {
+  if (i % 2 == 0) {
+  evenNums.push(i);
+}
+}
+
 
 // TODO: Write a for loop that adds the numbers 3 to 0 (in that order) to the countdown array
+for (let i=3; i>=0; i--) {
+  countdown.push(i)
+  console.log(countdown);
+}
+
+
 
 // do not change below this line
 module.exports = {
diff --git a/src/variables/assignment.js b/src/variables/assignment.js
index 98f2e31c..c100ea9a 100644
--- a/src/variables/assignment.js
+++ b/src/variables/assignment.js
@@ -1,11 +1,11 @@
 // do not edit this
 let firstNumber = 10
-firstNumber = 0
+firstNumber = 20
 
 // TODO: Set the value of firstNumber below so the tests pass
 
 // TODO: Change the code below so that the tests pass
-const secondNumber = 0 // edit this value
+const secondNumber = 42 // edit this value
 
 // do not edit the exported object.
 module.exports = {
diff --git a/src/variables/declaration.js b/src/variables/declaration.js
index 8afaa55b..e202ac76 100644
--- a/src/variables/declaration.js
+++ b/src/variables/declaration.js
@@ -4,10 +4,10 @@
 // TODO: Declare the variables firstName and age so that the tests pass
 
 // do not edit below this line
-let firstNameExport = ''
+let firstNameExport = 'Jane'
 try { firstNameExport = firstName } catch (e) {}
 
-let ageExport = 0
+let ageExport = 35
 try { ageExport = age } catch (e) {}
 
 module.exports = {
diff --git a/{ b/{
new file mode 100644
index 00000000..e69de29b