diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java
index e0af6a0..f708058 100644
--- a/src/main/java/io/zipcoder/Problem2.java
+++ b/src/main/java/io/zipcoder/Problem2.java
@@ -1,4 +1,51 @@
 package io.zipcoder;
+import java.util.ArrayList;
 
 public class Problem2 {
+    int maxNum;
+    public Problem2(int maxNum){
+        this.maxNum = maxNum;
+    }
+
+    public String withLoop(){
+        ArrayList<Integer> arr = new ArrayList<Integer>();
+        int fibNum = 0;
+        arr.add(fibNum);
+        int index = 0;
+        while(fibNum<maxNum){
+            if(arr.size() <= 1){
+                arr.add(1);
+            }else{
+                fibNum = arr.get(index)+arr.get(index-1);
+                if(fibNum<maxNum) {
+                    arr.add(fibNum);
+                }
+            }
+            index++;
+        }
+        String returnString = arr.toString();
+        return returnString.substring(1,returnString.length()-1);
+    }
+
+    public String withRecursion(){
+        ArrayList<Integer> arr = new ArrayList<Integer>();
+        arr.add(0);
+        String returnString = addToArray(arr).toString();
+        return returnString.substring(1,returnString.length()-1);
+    }
+
+    public ArrayList<Integer> addToArray(ArrayList<Integer> arr){
+        int fibNum;
+        if (arr.size() <= 1) {
+            fibNum = 1;
+        }else{
+            fibNum = arr.get(arr.size() - 1) + arr.get(arr.size() - 2);
+        }
+        if(fibNum<maxNum) {
+            arr.add(fibNum);
+            arr = addToArray(arr);
+        }
+        return arr;
+    }
+
 }
diff --git a/src/test/java/io/zipcoder/Problem2Test.java b/src/test/java/io/zipcoder/Problem2Test.java
index fa9ffa5..b865646 100644
--- a/src/test/java/io/zipcoder/Problem2Test.java
+++ b/src/test/java/io/zipcoder/Problem2Test.java
@@ -1,4 +1,23 @@
 package io.zipcoder;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class Problem2Test {
+
+    @Test
+    public void withLoopTest(){
+        String expected = "0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144";
+        Problem2 problem2 = new Problem2(150);
+        String actual = problem2.withLoop();
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void withRecursionTest(){
+        String expected = "0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144";
+        Problem2 problem2 = new Problem2(150);
+        String actual = problem2.withRecursion();
+        Assert.assertEquals(expected,actual);
+    }
 }