diff --git a/src/main/java/ArrayListCombiner/ArrayListCombiner.java b/src/main/java/ArrayListCombiner/ArrayListCombiner.java
index d302cd2..6ffa6d4 100644
--- a/src/main/java/ArrayListCombiner/ArrayListCombiner.java
+++ b/src/main/java/ArrayListCombiner/ArrayListCombiner.java
@@ -1,5 +1,7 @@
 package ArrayListCombiner;
 
+import Employee.*;
+
 import java.util.ArrayList;
 
 /**
@@ -9,4 +11,14 @@
  * The second method should be called superCombiner and should use ? super E
  */
 public class ArrayListCombiner {
+
+    public static <E> void extendCombiner (ArrayList<E> first, ArrayList<? extends E> second) {
+        first.addAll(second);
+
+    }
+
+    public static <E> void superCombiner(ArrayList<? super E> first, ArrayList<E> second) {
+        first.addAll(second);
+
+    }
 }
diff --git a/src/main/java/MapFunc/MapFunc.java b/src/main/java/MapFunc/MapFunc.java
index ed4bf66..7cb6e4d 100644
--- a/src/main/java/MapFunc/MapFunc.java
+++ b/src/main/java/MapFunc/MapFunc.java
@@ -9,4 +9,14 @@
  */
 public class MapFunc {
 
+    public static <T,R> ArrayList<R> map(ArrayList<T> obj, Function<T,R> func) {
+        ArrayList<R> temp = new ArrayList<>();
+        for (int i = 0; i < obj.size(); i++) {
+            temp.add(func.apply(obj.get(i)));
+
+        }
+        return temp;
+    }
+
+
 }
diff --git a/src/main/java/Pair/Arrays.java b/src/main/java/Pair/Arrays.java
index 5bdf780..7b324e8 100644
--- a/src/main/java/Pair/Arrays.java
+++ b/src/main/java/Pair/Arrays.java
@@ -10,7 +10,30 @@
  * A max method that returns the largest item in the arraylist
  * And a minmax method that returns a pair containing the largest and smallest items from the array list
  */
-public class Arrays {
-    public static <___> Pair<E> firstLast(ArrayList<___> a) {
+public class Arrays<E extends Comparable> {
+
+    public Arrays() {
+    }
+
+    public static <E extends Comparable> Pair<E > firstLast(ArrayList<E> a) {
+        return new Pair<E>(a.get(0), a.get(a.size()-1)) ;
+
+}
+
+    public static <E extends Comparable> E min(ArrayList<E> al) {
+        E min = al.get(0);
+        for (E val: al) {
+            if (val.compareTo(min) <0) min = val;
+        }
+        return min;
+
+    }
+
+    public static <E extends Comparable> Comparable max(ArrayList<E> al) {
+        return Collections.max(al);
+    }
+
+    public static <E extends Comparable> Pair<E> minMax(ArrayList<E> al) {
+        return new Pair(min(al), max(al));
     }
 }
diff --git a/src/main/java/Pair/Pair.java b/src/main/java/Pair/Pair.java
index c4dd905..6cb3018 100644
--- a/src/main/java/Pair/Pair.java
+++ b/src/main/java/Pair/Pair.java
@@ -7,6 +7,36 @@
  * min -> returns the minimum of the pair
  * max -> returns the maximum of the pair
  */
-public class Pair {
+public class Pair<E extends Comparable> {
+
+    private E e1;
+    private E e2;
+
+    public Pair(E e1, E e2) {
+        this.e1 = e1;
+        this.e2 = e2;
+    }
+
+    public E getFirst() {
+        return this.e1;
+    }
+
+    public E getSecond() {
+        return this.e2;
+    }
+
+    public E max() {
+        if (this.e1.compareTo(this.e2) > 0 ) {
+            return this.e1;
+        }
+        return this.e2;
+    }
+
+    public E min() {
+        if (this.e1.compareTo(this.e2) < 0 ) {
+            return this.e1;
+        }
+        return this.e2;
+    }
 
 }
diff --git a/src/main/java/StackArray/GenericStack.java b/src/main/java/StackArray/GenericStack.java
index d84c4db..32d4b2b 100644
--- a/src/main/java/StackArray/GenericStack.java
+++ b/src/main/java/StackArray/GenericStack.java
@@ -1,6 +1,8 @@
 package StackArray;
 
+import java.lang.reflect.Array;
 import java.util.Arrays;
+import java.util.Stack;
 
 /**
  * Expand the ArrayList implementation of stack here to use an E[] array.  Still implement push, pop, and isEmpty.
@@ -11,5 +13,29 @@ public class GenericStack<E> {
     private E[] elements;
 
     public GenericStack() {
+        this.elements = (E[]) new Object[0];
+
+    }
+
+    public E pop() {
+        E popValue = elements[elements.length -1];
+        elements = Arrays.copyOf(elements, elements.length-1);
+        return popValue;
+    }
+
+    public void push( E obj) {
+       elements =Arrays.copyOf(elements,elements.length +1);
+            elements[elements.length-1] = obj;
+
+
     }
+
+    public boolean isEmpty() {
+        for (E obj: elements)
+        { if (!obj.equals(null))
+            return false;
+        }
+        return true;
+    }
+
 }
diff --git a/src/main/java/StackArrayList/Stack.java b/src/main/java/StackArrayList/Stack.java
index 0338de3..ba0d383 100644
--- a/src/main/java/StackArrayList/Stack.java
+++ b/src/main/java/StackArrayList/Stack.java
@@ -11,6 +11,23 @@ public class Stack<E> {
 
 
     public Stack(){
+        this.elements = new ArrayList();
+    }
+
+    public E pop() {
+
+        return (E) elements.remove(elements.size()-1);
+        }
+
+    public void push( E obj) {
 
+        elements.add(elements.size(), obj);
+
+        }
+
+    public boolean isEmpty() {
+
+        return elements.size() == 0;
     }
+
 }
diff --git a/src/main/java/Table/Entry.java b/src/main/java/Table/Entry.java
index 8c97478..3f5a9ab 100644
--- a/src/main/java/Table/Entry.java
+++ b/src/main/java/Table/Entry.java
@@ -17,4 +17,10 @@ public V getValue() {
         return value;
     }
 
+    public void setKey(K key) {
+        this.key = key;
+    }
+    public void setValue(V value) {
+        this.value = value;
+    }
 }
diff --git a/src/main/java/Table/Table.java b/src/main/java/Table/Table.java
index 5ccce23..80fa24c 100644
--- a/src/main/java/Table/Table.java
+++ b/src/main/java/Table/Table.java
@@ -1,5 +1,6 @@
 package Table;
 
+
 import java.util.ArrayList;
 
 /**
@@ -10,8 +11,43 @@
  * Void return on `remove`.
  */
 public class Table<K, V> {
-    private ArrayList entries;
+
+    private ArrayList<Entry> entries;
+
+
 
     public Table() {
+        this.entries = new ArrayList<>();
+
+    }
+
+    public V get(K key) {
+        for (Entry entry: entries) {
+            if (key.equals(entry.getKey()))
+               return (V) entry.getValue();
+
+        }
+
+        return null;
+    }
+
+
+    public void put(K key, V value) {
+        for (Entry entry: entries) {
+            if(key.equals(entry.getKey())) {
+                entry.setValue(value);
+                return;
+            }
+        } entries.add(new Entry(key, value));
+
+    }
+
+    public void remove(K key) {
+        for (Entry entry: entries) {
+            if (key.equals(entry.getKey()))
+                entries.remove(entry);
+                return;
+        }
+
     }
-}
+ }
diff --git a/src/main/java/TableNested/TableNested.java b/src/main/java/TableNested/TableNested.java
index 7e0dfdd..1a9a638 100644
--- a/src/main/java/TableNested/TableNested.java
+++ b/src/main/java/TableNested/TableNested.java
@@ -1,5 +1,7 @@
 package TableNested;
 
+
+
 import java.util.ArrayList;
 
 /**
@@ -8,4 +10,67 @@
  */
 public class TableNested<K, V> {
 
+    private ArrayList<Entry> entries;
+
+    public TableNested() {
+        this.entries = new ArrayList<>();
+
+    }
+
+    public V get(K key) {
+        for (Entry entry: entries) {
+            if (key.equals(entry.getKey()))
+                return (V) entry.getValue();
+
+        }
+
+        return null;
+    }
+
+
+    public void put(K key, V value) {
+        for (Entry entry: entries) {
+            if(key.equals(entry.getKey())) {
+                entry.setValue(value);
+                return;
+            }
+        } entries.add(new Entry(key, value));
+
+    }
+
+    public void remove(K key) {
+        for (Entry entry: entries) {
+            if (key.equals(entry.getKey()))
+                entries.remove(entry);
+            return;
+        }
+
+    }
+}
+
+
+class Entry<K, V> {
+    private K key;
+    private V value;
+
+    public Entry(K key, V value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public K getKey() {
+        return key;
+    }
+
+    public V getValue() {
+        return value;
+    }
+
+    public void setKey(K key) {
+        this.key = key;
+    }
+    public void setValue(V value) {
+        this.value = value;
+    }
 }
+
diff --git a/src/test/java/ArrayListCombiner/ArrayListCombinerTest.java b/src/test/java/ArrayListCombiner/ArrayListCombinerTest.java
index 957a878..9e16484 100644
--- a/src/test/java/ArrayListCombiner/ArrayListCombinerTest.java
+++ b/src/test/java/ArrayListCombiner/ArrayListCombinerTest.java
@@ -9,40 +9,40 @@
 import java.util.ArrayList;
 
 public class ArrayListCombinerTest {
-//    Employee foo = new Employee("FOO", 100);
-//    Manager bar = new Manager("BAR", 100);
-//    @Test
-//    public void testExtendCombiner() throws Exception {
-//        // Given an array list with employees
-//        ArrayList<Employee> first = new ArrayList<>();
-//        first.add(foo);
-//        // An an array list with managers
-//        ArrayList<Manager> second = new ArrayList<>();
-//        second.add(bar);
-//        // When  I combine them
-//        ArrayListCombiner.extendCombiner(first, second);
-//        // Then I should get an arrayList with both
-//        ArrayList<Employee> expected = new ArrayList<>();
-//        expected.add(foo);
-//        expected.add(bar);
-//        Assert.assertEquals(expected, first);
-//    }
-//
-//    @Test
-//    public void testSuperCombiner() throws Exception {
-//        // Given an array list with employees
-//        ArrayList<Employee> first = new ArrayList<>();
-//        first.add(foo);
-//        // An an array list with managers
-//        ArrayList<Manager> second = new ArrayList<>();
-//        second.add(bar);
-//        // When  I combine them
-//        ArrayListCombiner.superCombiner(first, second);
-//        // Then I should get an arrayList with both
-//        ArrayList<Employee> expected = new ArrayList<>();
-//        expected.add(foo);
-//        expected.add(bar);
-//        Assert.assertEquals(expected, first);
-//    }
+    Employee foo = new Employee("FOO", 100);
+    Manager bar = new Manager("BAR", 100);
+    @Test
+    public void testExtendCombiner() throws Exception {
+        // Given an array list with employees
+        ArrayList<Employee> first = new ArrayList<>();
+        first.add(foo);
+        // An an array list with managers
+        ArrayList<Manager> second = new ArrayList<>();
+        second.add(bar);
+        // When  I combine them
+        ArrayListCombiner.extendCombiner(first, second);
+        // Then I should get an arrayList with both
+        ArrayList<Employee> expected = new ArrayList<>();
+        expected.add(foo);
+        expected.add(bar);
+        Assert.assertEquals(expected, first);
+    }
+
+    @Test
+    public void testSuperCombiner() throws Exception {
+        // Given an array list with employees
+        ArrayList<Employee> first = new ArrayList<>();
+        first.add(foo);
+        // An an array list with managers
+        ArrayList<Manager> second = new ArrayList<>();
+        second.add(bar);
+        // When  I combine them
+        ArrayListCombiner.superCombiner(first, second);
+        // Then I should get an arrayList with both
+        ArrayList<Employee> expected = new ArrayList<>();
+        expected.add(foo);
+        expected.add(bar);
+        Assert.assertEquals(expected, first);
+    }
 
 }
\ No newline at end of file
diff --git a/src/test/java/MapFunc/MapFuncTest.java b/src/test/java/MapFunc/MapFuncTest.java
index 3c7534f..a3fdf58 100644
--- a/src/test/java/MapFunc/MapFuncTest.java
+++ b/src/test/java/MapFunc/MapFuncTest.java
@@ -1,36 +1,36 @@
-//package MapFunc;
-//
-//import MapFunc.MapFunc;
-//import org.junit.Test;
-//
-//import java.util.ArrayList;
-//import org.junit.Assert;
-//
-//public class MapFuncTest {
-//    @Test
-//    public void testSingleTypeMap() throws Exception {
-//        // Given an integer array list
-//        ArrayList<Integer> intList = new ArrayList<>();
-//        intList.add(1);
-//        intList.add(2);
-//        // When it's mapped with a function to double the value
-//        ArrayList<Integer> mappedList = MapFunc.map(intList, num -> num*2);
-//        // Then all the values are doubled
-//        Assert.assertEquals(new Integer(2), mappedList.get(0));
-//        Assert.assertEquals(new Integer(4), mappedList.get(1));
-//    }
-//
-//    @Test
-//    public void testMultipleTypeMap() throws Exception {
-//        // Given an integer array list
-//        ArrayList<Integer> intList = new ArrayList<>();
-//        intList.add(1);
-//        intList.add(2);
-//        // When it's mapped with to string
-//        ArrayList<String> mappedList = MapFunc.map(intList, num -> num.toString());
-//        // Then all the values are doubled
-//        Assert.assertEquals("1", mappedList.get(0));
-//        Assert.assertEquals("2", mappedList.get(1));
-//    }
-//
-//}
\ No newline at end of file
+package MapFunc;
+
+import MapFunc.MapFunc;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import org.junit.Assert;
+
+public class MapFuncTest {
+    @Test
+    public void testSingleTypeMap() throws Exception {
+        // Given an integer array list
+        ArrayList<Integer> intList = new ArrayList<>();
+        intList.add(1);
+        intList.add(2);
+        // When it's mapped with a function to double the value
+        ArrayList<Integer> mappedList = MapFunc.map(intList, num -> num*2);
+        // Then all the values are doubled
+        Assert.assertEquals(new Integer(2), mappedList.get(0));
+        Assert.assertEquals(new Integer(4), mappedList.get(1));
+    }
+
+    @Test
+    public void testMultipleTypeMap() throws Exception {
+        // Given an integer array list
+        ArrayList<Integer> intList = new ArrayList<>();
+        intList.add(1);
+        intList.add(2);
+        // When it's mapped with to string
+        ArrayList<String> mappedList = MapFunc.map(intList, num -> num.toString());
+        // Then all the values are doubled
+        Assert.assertEquals("1", mappedList.get(0));
+        Assert.assertEquals("2", mappedList.get(1));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/Pair/ArraysTest.java b/src/test/java/Pair/ArraysTest.java
index 4d32e23..1e94232 100644
--- a/src/test/java/Pair/ArraysTest.java
+++ b/src/test/java/Pair/ArraysTest.java
@@ -1,74 +1,75 @@
-//package Pair;
-//
-//import org.junit.Assert;
-//import org.junit.Test;
-//
-//import java.util.ArrayList;
-//
-//public class ArraysTest {
-//    @Test
-//    public void firstLast() throws Exception {
-//        // Given an ArrayList of Integers
-//        ArrayList<Integer> al = new ArrayList<>();
-//        al.add(1);
-//        al.add(5);
-//        al.add(3);
-//        al.add(4);
-//        al.add(2);
-//        al.add(0);
-//        al.add(1000);
-//        // When firstLast is called
-//        Pair<Integer> result = Arrays.firstLast(al);
-//        // Then it should return the first and last items
-//        Assert.assertEquals(new Integer(1), result.getFirst());
-//        Assert.assertEquals(new Integer(1000), result.getSecond());
-//    }
-//
-//    @Test
-//    public void testMin() throws Exception {
-//        // Given an ArrayList of Integers
-//        ArrayList<Integer> al = new ArrayList<>();
-//        al.add(1);
-//        al.add(5);
-//        al.add(3);
-//        al.add(4);
-//        al.add(2);
-//        al.add(0);
-//        al.add(1000);
-//        // When min is called assert that it gets the smallest item
-//        Assert.assertEquals(new Integer(0), Arrays.min(al));
-//    }
-//
-//    @Test
-//    public void testMax() throws Exception {
-//        // Given an ArrayList of Integers
-//        ArrayList<Integer> al = new ArrayList<>();
-//        al.add(1);
-//        al.add(5);
-//        al.add(3);
-//        al.add(4);
-//        al.add(2);
-//        al.add(0);
-//        al.add(1000);
-//        // When min is called assert that it gets the largest item
-//        Assert.assertEquals(new Integer(1000), Arrays.max(al));
-//    }
-//
-//    @Test
-//    public void testMinMax() throws Exception {
-//        // Given an ArrayList of Integers
-//        ArrayList<Integer> al = new ArrayList<>();
-//        al.add(1);
-//        al.add(5);
-//        al.add(3);
-//        al.add(4);
-//        al.add(2);
-//        al.add(0);
-//        al.add(1000);
-//        // When minMax is called
-//        Pair<Integer> result = Arrays.minMax(al);
-//        // Then it should return the first and last items
-//        Assert.assertEquals(new Integer(0), result.min());
-//        Assert.assertEquals(new Integer(1000), result.max());
-//    }
-//}
+package Pair;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+public class ArraysTest {
+    @Test
+    public void firstLast() throws Exception {
+        // Given an ArrayList of Integers
+        ArrayList<Integer> al = new ArrayList<>();
+        al.add(1);
+        al.add(5);
+        al.add(3);
+        al.add(4);
+        al.add(2);
+        al.add(0);
+        al.add(1000);
+        // When firstLast is called
+        Pair<Integer> result = Arrays.firstLast(al);
+        // Then it should return the first and last items
+        Assert.assertEquals(new Integer(1), result.getFirst());
+        Assert.assertEquals(new Integer(1000), result.getSecond());
+    }
+
+
+    @Test
+    public void testMin() throws Exception {
+        // Given an ArrayList of Integers
+        ArrayList<Integer> al = new ArrayList<>();
+        al.add(1);
+        al.add(5);
+        al.add(3);
+        al.add(4);
+        al.add(2);
+        al.add(0);
+        al.add(1000);
+        // When min is called assert that it gets the smallest item
+        Assert.assertEquals(new Integer(0), Arrays.min(al));
+    }
+
+    @Test
+    public void testMax() throws Exception {
+        // Given an ArrayList of Integers
+        ArrayList<Integer> al = new ArrayList<>();
+        al.add(1);
+        al.add(5);
+        al.add(3);
+        al.add(4);
+        al.add(2);
+        al.add(0);
+        al.add(1000);
+        // When min is called assert that it gets the largest item
+        Assert.assertEquals(new Integer(1000), Arrays.max(al));
+    }
+
+    @Test
+    public void testMinMax() throws Exception {
+        // Given an ArrayList of Integers
+        ArrayList<Integer> al = new ArrayList<>();
+        al.add(1);
+        al.add(5);
+        al.add(3);
+        al.add(4);
+        al.add(2);
+        al.add(0);
+        al.add(1000);
+        // When minMax is called
+        Pair<Integer> result = Arrays.minMax(al);
+        // Then it should return the first and last items
+        Assert.assertEquals(new Integer(0), result.min());
+        Assert.assertEquals(new Integer(1000), result.max());
+    }
+}
diff --git a/src/test/java/Pair/PairTest.java b/src/test/java/Pair/PairTest.java
index d616178..baf2071 100644
--- a/src/test/java/Pair/PairTest.java
+++ b/src/test/java/Pair/PairTest.java
@@ -1,32 +1,32 @@
-//package Pair;
-//
-//import org.junit.Test;
-//import org.junit.Assert;
-//
-//public class PairTest {
-//
-//    @Test
-//    public void testGetters() throws Exception {
-//        // Given a pair with "Foo" and "Bar"
-//        Pair<String> p = new Pair<String>("Foo", "Bar");
-//        // When getFirst and getSecond are called, they should be returned.
-//        Assert.assertEquals("Foo", p.getFirst());
-//        Assert.assertEquals("Bar",  p.getSecond());
-//    }
-//
-//    @Test
-//    public void testMin() throws Exception {
-//        // Given a pair with two values
-//        Pair<Double> p = new Pair<Double>(1.23, 2.34);
-//        // When p.min() is called, the smallest should be returned.
-//        Assert.assertEquals(new Double(1.23), p.min());
-//    }
-//
-//    @Test
-//    public void testMax() throws Exception {
-//        // Given a pair with two values
-//        Pair<Double> p = new Pair<Double>(1.23, 2.34);
-//        // When p.max() is called, the largest should be returned.
-//        Assert.assertEquals(new Double(2.34), p.max());
-//    }
-//}
\ No newline at end of file
+package Pair;
+
+import org.junit.Test;
+import org.junit.Assert;
+
+public class PairTest {
+
+    @Test
+    public void testGetters() throws Exception {
+        // Given a pair with "Foo" and "Bar"
+        Pair<String> p = new Pair<String>("Foo", "Bar");
+        // When getFirst and getSecond are called, they should be returned.
+        Assert.assertEquals("Foo", p.getFirst());
+        Assert.assertEquals("Bar",  p.getSecond());
+    }
+
+    @Test
+    public void testMin() throws Exception {
+        // Given a pair with two values
+        Pair<Double> p = new Pair<Double>(1.23, 2.34);
+        // When p.min() is called, the smallest should be returned.
+        Assert.assertEquals(new Double(1.23), p.min());
+    }
+
+    @Test
+    public void testMax() throws Exception {
+        // Given a pair with two values
+        Pair<Double> p = new Pair<Double>(1.23, 2.34);
+        // When p.max() is called, the largest should be returned.
+        Assert.assertEquals(new Double(2.34), p.max());
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/StackArray/GenericStackTest.java b/src/test/java/StackArray/GenericStackTest.java
index 0aacd92..e79936e 100644
--- a/src/test/java/StackArray/GenericStackTest.java
+++ b/src/test/java/StackArray/GenericStackTest.java
@@ -1,41 +1,44 @@
-//package StackArray;
-//
-//import org.junit.Assert;
-//import org.junit.Test;
-//
-//public class GenericStackTest {
-//    @Test
-//    public void testPushingGrowsTheStack() throws Exception {
-//        // Given an empty stack
-//        GenericStack<String> stack = new GenericStack<>();
-//
-//        // Assert that it is empty.
-//        Assert.assertEquals(true, stack.isEmpty());
-//        // When we push something onto the stack
-//        stack.push("foobar");
-//        // Then it shouldn't be empty
-//        Assert.assertEquals(false, stack.isEmpty());
-//    }
-//
-//    @Test
-//    public void testPushingAndPoppingOrder() throws Exception {
-//        // Given an empty stack
-//        GenericStack<String> stack = new GenericStack<>();
-//        // When we push two elements on it
-//        stack.push("foo");
-//        stack.push("bar");
-//        // Then we should see them returned in the correct order
-//        Assert.assertEquals("bar", stack.pop());
-//        Assert.assertEquals("foo", stack.pop());
-//    }
-//
-//    @Test(expected = IndexOutOfBoundsException.class)
-//    public void testPopFirst() throws Exception {
-//        // Given an empty stack
-//        GenericStack<String> stack = new GenericStack<>();
-//        // When it's popped
-//        stack.pop();
-//        // Then we should get an exception
-//    }
-//
-//}
\ No newline at end of file
+package StackArray;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+public class GenericStackTest {
+    @Test
+    public void testPushingGrowsTheStack() throws Exception {
+        // Given an empty stack
+        GenericStack<String> stack = new GenericStack<>();
+
+        // Assert that it is empty.
+        Assert.assertEquals(true, stack.isEmpty());
+        // When we push something onto the stack
+        stack.push("foobar");
+        // Then it shouldn't be empty
+        Assert.assertEquals(false, stack.isEmpty());
+    }
+
+    @Test
+    public void testPushingAndPoppingOrder() throws Exception {
+        // Given an empty stack
+        GenericStack<String> stack = new GenericStack<>();
+        // When we push two elements on it
+        stack.push("foo");
+        stack.push("bar");
+
+        // Then we should see them returned in the correct order
+        Assert.assertEquals("bar", stack.pop());
+        Assert.assertEquals("foo", stack.pop());
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void testPopFirst() throws Exception {
+        // Given an empty stack
+        GenericStack<String> stack = new GenericStack<>();
+        // When it's popped
+        stack.pop();
+        // Then we should get an exception
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/StackArrayList/StackTest.java b/src/test/java/StackArrayList/StackTest.java
index 0ce7cf0..00dc659 100644
--- a/src/test/java/StackArrayList/StackTest.java
+++ b/src/test/java/StackArrayList/StackTest.java
@@ -1,45 +1,45 @@
-//package StackArrayList;
-//
-//import org.junit.Test;
-//
-//import org.junit.Assert;
-//
-//public class StackTest {
-//    @Test
-//    public void testEmptyStackStopsBeingEmptyWhenAnItemIsAdded() throws Exception {
-//        // Given an empty stack
-//        Stack<String> stack = new Stack<>();
-//        // Assert that it starts empty
-//        Assert.assertEquals(true, stack.isEmpty());
-//        // When an element gets pushed
-//        stack.push("foobar");
-//        // Then the stack should not be empty.
-//        Assert.assertEquals(false, stack.isEmpty());
-//    }
-//
-//    @Test
-//    public void testTwoItemsPushedComeOutInCorrectOrder() throws Exception {
-//        // Given an empty stack
-//        Stack<String> stack = new Stack<>();
-//
-//        //When two items are pushed
-//        stack.push("foo");
-//        stack.push("bar");
-//
-//        // Then they should come off in reverse order.
-//        Assert.assertEquals("bar", stack.pop());
-//        Assert.assertEquals("foo", stack.pop());
-//
-//        // And then the stack should be empty
-//        Assert.assertEquals(true, stack.isEmpty());
-//    }
-//
-//    @Test(expected = IndexOutOfBoundsException.class)
-//    public void testPopFirst() throws Exception {
-//        // Given an empty stack
-//        Stack<String> stack = new Stack<>();
-//        // Then it is popped
-//        stack.pop();
-//        // We should get an exception
-//    }
-//}
\ No newline at end of file
+package StackArrayList;
+
+import org.junit.Test;
+
+import org.junit.Assert;
+
+public class StackTest {
+    @Test
+    public void testEmptyStackStopsBeingEmptyWhenAnItemIsAdded() throws Exception {
+        // Given an empty stack
+        Stack<String> stack = new Stack<>();
+        // Assert that it starts empty
+        Assert.assertEquals(true, stack.isEmpty());
+        // When an element gets pushed
+        stack.push("foobar");
+        // Then the stack should not be empty.
+        Assert.assertEquals(false, stack.isEmpty());
+    }
+
+    @Test
+    public void testTwoItemsPushedComeOutInCorrectOrder() throws Exception {
+        // Given an empty stack
+        Stack<String> stack = new Stack<>();
+
+        //When two items are pushed
+        stack.push("foo");
+        stack.push("bar");
+
+        // Then they should come off in reverse order.
+        Assert.assertEquals("bar", stack.pop());
+        Assert.assertEquals("foo", stack.pop());
+
+        // And then the stack should be empty
+        Assert.assertEquals(true, stack.isEmpty());
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void testPopFirst() throws Exception {
+        // Given an empty stack
+        Stack<String> stack = new Stack<>();
+        // Then it is popped
+        stack.pop();
+        // We should get an exception
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/Swap/SwapTest.java b/src/test/java/Swap/SwapTest.java
index 2583b9d..7cd6a14 100644
--- a/src/test/java/Swap/SwapTest.java
+++ b/src/test/java/Swap/SwapTest.java
@@ -1,16 +1,16 @@
 package Swap;
-//
-//import org.junit.Assert;
-//import org.junit.Test;
-//
-///**
-// * Get the tests passing.
-// */
-//public class SwapTest {
-//    @Test
-//    public void testSwap() throws Exception {
-//        Double[] result = Swap.swap(0,1, 1.5, 2,3);
-//        Double[] expected = {2.0, 1.5, 3.0};
-//        Assert.assertArrayEquals(expected, result);
-//    }
-//}
\ No newline at end of file
+
+import org.junit.Assert;
+        import org.junit.Test;
+
+/**
+ * Get the tests passing.
+ */
+public class SwapTest {
+    @Test
+    public void testSwap() throws Exception {
+        Double[] result = Swap.swap(0,1, 1.5, 2.0,3.0);
+        Double[] expected = {2.0, 1.5, 3.0};
+        Assert.assertArrayEquals(expected, result);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/Table/TableTest.java b/src/test/java/Table/TableTest.java
index 15ac19c..8bebde6 100644
--- a/src/test/java/Table/TableTest.java
+++ b/src/test/java/Table/TableTest.java
@@ -1,50 +1,50 @@
-//package Table;
-//
-//import org.junit.Assert;
-//import org.junit.Test;
-//
-//public class TableTest {
-//    @Test
-//    public void testGetWithoutAnItemReturnsNull() throws Exception {
-//        // Given an empty table
-//        Table<String, Integer> table = new Table<String, Integer>();
-//        // When we try and get an item then it returns null
-//        Assert.assertEquals(table.get("foo"), null);
-//    }
-//
-//    @Test
-//    public void testPutAnItemReturnsAndDoesNotDelete() throws Exception {
-//        //Given an empty table
-//        Table<String, Integer> table = new Table<String, Integer>();
-//        // When we put an item in it
-//        table.put("foo", 1);
-//        // Then we should be able to get it's value
-//        Assert.assertEquals(table.get("foo"), new Integer(1));
-//        // And then we should be able to get it again as it wasn't removed
-//        Assert.assertEquals(table.get("foo"), new Integer(1));
-//    }
-//
-//    @Test
-//    public void testOverwritingAnItem() throws Exception {
-//        //Given an empty table
-//        Table<String, Integer> table = new Table<String, Integer>();
-//        // When we put an item in it
-//        table.put("foo", 1);
-//        // And we put a new value with the same key
-//        table.put("foo", 2);
-//        // Then we should get back the new value
-//        Assert.assertEquals(table.get("foo"), new Integer(2));
-//    }
-//
-//    @Test
-//    public void testRemoveAnItem() throws Exception {
-//        //Given an empty table
-//        Table<String, Integer> table = new Table<String, Integer>();
-//        // When we put an item in it
-//        table.put("foo", 1);
-//        // And we remove that item
-//        table.remove("foo");
-//        // Then we should get back null for that balue
-//        Assert.assertEquals(table.get("foo"), null);
-//    }
-//}
\ No newline at end of file
+package Table;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TableTest {
+    @Test
+    public void testGetWithoutAnItemReturnsNull() throws Exception {
+        // Given an empty table
+        Table<String, Integer> table = new Table<String, Integer>();
+        // When we try and get an item then it returns null
+        Assert.assertEquals(table.get("foo"), null);
+    }
+
+    @Test
+    public void testPutAnItemReturnsAndDoesNotDelete() throws Exception {
+        //Given an empty table
+        Table<String, Integer> table = new Table<String, Integer>();
+        // When we put an item in it
+        table.put("foo", 1);
+        // Then we should be able to get it's value
+        Assert.assertEquals(table.get("foo"), new Integer(1));
+        // And then we should be able to get it again as it wasn't removed
+        Assert.assertEquals(table.get("foo"), new Integer(1));
+    }
+
+    @Test
+    public void testOverwritingAnItem() throws Exception {
+        //Given an empty table
+        Table<String, Integer> table = new Table<String, Integer>();
+        // When we put an item in it
+        table.put("foo", 1);
+        // And we put a new value with the same key
+        table.put("foo", 2);
+        // Then we should get back the new value
+        Assert.assertEquals(table.get("foo"), new Integer(2));
+    }
+
+    @Test
+    public void testRemoveAnItem() throws Exception {
+        //Given an empty table
+        Table<String, Integer> table = new Table<String, Integer>();
+        // When we put an item in it
+        table.put("foo", 1);
+        // And we remove that item
+        table.remove("foo");
+        // Then we should get back null for that balue
+        Assert.assertEquals(table.get("foo"), null);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/TableNested/TableNestedTest.java b/src/test/java/TableNested/TableNestedTest.java
index 8432277..fdf12d5 100644
--- a/src/test/java/TableNested/TableNestedTest.java
+++ b/src/test/java/TableNested/TableNestedTest.java
@@ -1,50 +1,50 @@
-//package TableNested;
-//
-//import org.junit.Assert;
-//import org.junit.Test;
-//
-//public class TableNestedTest {
-//    @Test
-//    public void testGetWithoutAnItemReturnsNull() throws Exception {
-//        // Given an empty table
-//        TableNested<String, Integer> table = new TableNested<String, Integer>();
-//        // When we try and get an item then it returns null
-//        Assert.assertEquals(table.get("foo"), null);
-//    }
-//
-//    @Test
-//    public void testPutAnItemReturnsAndDoesNotDelete() throws Exception {
-//        //Given an empty table
-//        TableNested<String, Integer> table = new TableNested<String, Integer>();
-//        // When we put an item in it
-//        table.put("foo", 1);
-//        // Then we should be able to get it's value
-//        Assert.assertEquals(table.get("foo"), new Integer(1));
-//        // And then we should be able to get it again as it wasn't removed
-//        Assert.assertEquals(table.get("foo"), new Integer(1));
-//    }
-//
-//    @Test
-//    public void testOverwritingAnItem() throws Exception {
-//        //Given an empty table
-//        TableNested<String, Integer> table = new TableNested<String, Integer>();
-//        // When we put an item in it
-//        table.put("foo", 1);
-//        // And we put a new value with the same key
-//        table.put("foo", 2);
-//        // Then we should get back the new value
-//        Assert.assertEquals(table.get("foo"), new Integer(2));
-//    }
-//
-//    @Test
-//    public void testRemoveAnItem() throws Exception {
-//        //Given an empty table
-//        TableNested<String, Integer> table = new TableNested<String, Integer>();
-//        // When we put an item in it
-//        table.put("foo", 1);
-//        // And we remove that item
-//        table.remove("foo");
-//        // Then we should get back null for that balue
-//        Assert.assertEquals(table.get("foo"), null);
-//    }
-//}
\ No newline at end of file
+package TableNested;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TableNestedTest {
+    @Test
+    public void testGetWithoutAnItemReturnsNull() throws Exception {
+        // Given an empty table
+        TableNested<String, Integer> table = new TableNested<String, Integer>();
+        // When we try and get an item then it returns null
+        Assert.assertEquals(table.get("foo"), null);
+    }
+
+    @Test
+    public void testPutAnItemReturnsAndDoesNotDelete() throws Exception {
+        //Given an empty table
+        TableNested<String, Integer> table = new TableNested<String, Integer>();
+        // When we put an item in it
+        table.put("foo", 1);
+        // Then we should be able to get it's value
+        Assert.assertEquals(table.get("foo"), new Integer(1));
+        // And then we should be able to get it again as it wasn't removed
+        Assert.assertEquals(table.get("foo"), new Integer(1));
+    }
+
+    @Test
+    public void testOverwritingAnItem() throws Exception {
+        //Given an empty table
+        TableNested<String, Integer> table = new TableNested<String, Integer>();
+        // When we put an item in it
+        table.put("foo", 1);
+        // And we put a new value with the same key
+        table.put("foo", 2);
+        // Then we should get back the new value
+        Assert.assertEquals(table.get("foo"), new Integer(2));
+    }
+
+    @Test
+    public void testRemoveAnItem() throws Exception {
+        //Given an empty table
+        TableNested<String, Integer> table = new TableNested<String, Integer>();
+        // When we put an item in it
+        table.put("foo", 1);
+        // And we remove that item
+        table.remove("foo");
+        // Then we should get back null for that balue
+        Assert.assertEquals(table.get("foo"), null);
+    }
+}
\ No newline at end of file