diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java
index e0af6a0..6b4b7e3 100644
--- a/src/main/java/io/zipcoder/Problem2.java
+++ b/src/main/java/io/zipcoder/Problem2.java
@@ -1,4 +1,48 @@
 package io.zipcoder;
 
 public class Problem2 {
+
+    public static void main(String args[]) {
+
+        Problem2 problem2 = new Problem2();
+
+        problem2.fibonacciLoop(10); // recursion
+        System.out.println();
+        problem2.fiboWithLoops(10);  // for loop
+
+    }
+
+    public void fibonacciLoop(int number) {
+
+        for (int i = 2; i <= number; i++) {
+
+            System.out.print(fibonacci(i) + " ");
+        }
+    }
+
+    public int fibonacci(int number) {
+        if (number == 1 || number == 2) {
+            return 1;
+        }
+        return fibonacci(number - 1) + fibonacci(number - 2);
+
+    }
+
+    public void fiboWithLoops(int a){
+           int result = 0 ;
+           int previousNum = 0;
+           int nextNum = 1;
+
+        for (int i = 0;i<a;i++ ){
+
+            result = previousNum + nextNum;
+            previousNum = nextNum;
+            nextNum = result;
+            System.out.print(result + " ");
+        }
+    }
+
 }
+
+
+
diff --git a/src/test/java/io/zipcoder/Problem2Test.java b/src/test/java/io/zipcoder/Problem2Test.java
index fa9ffa5..df1a893 100644
--- a/src/test/java/io/zipcoder/Problem2Test.java
+++ b/src/test/java/io/zipcoder/Problem2Test.java
@@ -1,4 +1,27 @@
 package io.zipcoder;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class Problem2Test {
+
+    Problem2 problem2 = new Problem2();
+    @Test
+    public void fiboonacciTest(){
+       problem2.fibonacci(3);
+       int expected = 2;
+        Assert.assertEquals(expected, problem2.fibonacci(3));
+    }
+    @Test
+    public void fiboonacciLoopTest(){
+        problem2.fibonacciLoop(3);
+        int expected = 2;
+        Assert.assertEquals(expected, problem2.fibonacci(3));
+
+    }
+
+
+
+
+
 }