diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java
index e0af6a0..e2059f5 100644
--- a/src/main/java/io/zipcoder/Problem2.java
+++ b/src/main/java/io/zipcoder/Problem2.java
@@ -1,4 +1,28 @@
 package io.zipcoder;
 
 public class Problem2 {
+
+    public String iterationMethod(int n){
+        if(n <= 1) {
+            return String.valueOf(n);
+        }
+        int num = 1;
+        int prevNum = 1;
+
+        for(int i=2; i<n; i++) {
+            int temp = num;
+            num += prevNum;
+            prevNum = temp;
+        }
+        return String.valueOf(num);
+    }
+
+    public String recursionMethod(int n){
+        if(n == 0)
+            return String.valueOf(0);
+        else if(n == 1)
+            return String.valueOf(1);
+        else
+            return recursionMethod(n - 1) + recursionMethod(n - 2);
+    }
 }
diff --git a/src/test/java/io/zipcoder/Problem2Test.java b/src/test/java/io/zipcoder/Problem2Test.java
index fa9ffa5..8d61bd3 100644
--- a/src/test/java/io/zipcoder/Problem2Test.java
+++ b/src/test/java/io/zipcoder/Problem2Test.java
@@ -1,4 +1,24 @@
 package io.zipcoder;
 
+import org.junit.Test;
+import org.junit.Assert;
+
 public class Problem2Test {
+
+    Problem2 problem2 = new Problem2();
+
+    @Test
+    public void iterationMethodTest() throws Exception {
+        String expected = "0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144";
+        String actual = problem2.iterationMethod(150);
+        Assert.assertEquals(expected,actual);
+
+    }
+
+    @Test
+    public void recursionMethodTest() throws Exception {
+        String expected = "0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144";
+        String actual = problem2.recursionMethod(150);
+        Assert.assertEquals(expected,actual);
+    }
 }