diff --git a/pom.xml b/pom.xml
index 2a6372d..18e10ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,12 @@
     <artifactId>InterviewProblem1</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>
diff --git a/src/main/java/io/zipcoder/Problem1.java b/src/main/java/io/zipcoder/Problem1.java
index 6cd6024..e2bbc30 100644
--- a/src/main/java/io/zipcoder/Problem1.java
+++ b/src/main/java/io/zipcoder/Problem1.java
@@ -1,4 +1,61 @@
 package io.zipcoder;
+//Example:
+//One method using iteration, another using recursion
+//Given the following map { ‘f’ : ‘7’, ‘s’:’$’, ‘1’:’!’, ‘a’.:’@’}, your method should
+// replace any character represented by a key in the map, with its corresponding value.
 
+//Input = “The Farmer went to the store to get 1 dollar’s worth of fertilizer”
+// Output = “The 7@rmer went to the $tore to get ! doll@r’$ worth of 7ertilizer”
 public class Problem1 {
+
+    public static String iterativeSolution(String input){
+
+        input=input.replaceAll("[f|F]\\B", "7");
+        char[] charArray = input.toCharArray();
+
+        for (int i=0; i<charArray.length; i++)
+        {
+            charArray[i]=checkAndReplace(charArray[i]);
+        }
+
+        return (new String(charArray));
+    }
+
+    public static String recursiveSolution(String input){
+        input=recursiveRegexHelper(input);
+        return input;
+    }
+
+    private static String recursiveRegexHelper(String input){
+
+        if (input.contains("s")){
+            String output=recursiveRegexHelper(input.replaceAll("s", "$"));//Doesn't like $?
+            return (output);
+        } else if (input.contains("1")){
+            return (recursiveRegexHelper(input.replace("1","!")));
+        }else if (input.contains("a")){
+            return (recursiveRegexHelper(input.replaceAll("a", "@")));
+        }else{
+            return (input.replaceAll("[f|F]\\B", "7"));
+        }
+
+    }
+
+    private static char checkAndReplace(char c) {
+        switch (c) {
+            case 's': {
+                return '$';
+            }
+            case '1': {
+                return '!';
+            }
+            case 'a': {
+                return '@';
+            }
+            default: {
+                return c;
+            }
+        }
+    }
+
 }
diff --git a/src/test/java/io/zipcoder/Problem1Test.java b/src/test/java/io/zipcoder/Problem1Test.java
index de82e99..3d10b3a 100644
--- a/src/test/java/io/zipcoder/Problem1Test.java
+++ b/src/test/java/io/zipcoder/Problem1Test.java
@@ -1,4 +1,36 @@
 package io.zipcoder;
+import io.zipcoder.Problem1;
 
+//Example:
+//One method using iteration, another using recursion
+//Given the following map { ‘f’ : ‘7’, ‘s’:’$’, ‘1’:’!’, ‘a’.:’@’}, your method should
+// replace any character represented by a key in the map, with its corresponding value.
+
+import org.junit.Assert;
+import org.junit.Test;
+
+//Input = “The Farmer went to the store to get 1 dollar’s worth of fertilizer”
+// Output = “The 7@rmer went to the $tore to get ! doll@r’$ worth of 7ertilizer”
 public class Problem1Test {
+
+    @Test
+    public void testIterativeSolution(){
+
+        String input = "The Farmer went to the store to get 1 dollar’s worth of fertilizer";
+        String expectedOutput = "The 7@rmer went to the $tore to get ! doll@r’$ worth of 7ertilizer";
+        String actualOutput = Problem1.iterativeSolution(input);
+        Assert.assertEquals(expectedOutput, actualOutput);
+
+    }
+
+
+
+    @Test
+    public void testRecursiveSolution(){
+        String input = "The Farmer went to the store to get 1 dollar’s worth of fertilizer";
+        String expectedOutput = "The 7@rmer went to the $tore to get ! doll@r’$ worth of 7ertilizer";
+        String actualOutput = Problem1.recursiveSolution(input);
+        Assert.assertEquals(expectedOutput, actualOutput);
+    }
+
 }