diff --git a/pom.xml b/pom.xml
index 682d6db..956fa2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,5 +10,10 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/CurrencyConversion.java b/src/main/java/CurrencyConversion.java
new file mode 100644
index 0000000..d3cdd76
--- /dev/null
+++ b/src/main/java/CurrencyConversion.java
@@ -0,0 +1,37 @@
+import java.text.DecimalFormat;
+
+public class CurrencyConversion {
+
+        static double USD = 1.00;
+        static double EURO = 0.94;
+        static double BRITISH_POUND = 0.82;
+        static double INDIAN_RUPEE = 68.32;
+        static double AUSTRALIAN_DOLLAR = 1.35;
+        static double CANADIAN_DOLLAR = 1.32;
+        static double SINGAPORE_DOLLAR = 1.43;
+        static double SWISS_FRANC = 1.01;
+        static double MALAYSIAN_RINGGIT = 4.47;
+        static double JAPANESE_YEN = 115.84;
+        static double CHINESE_YUAN_RENMINBI = 6.92;
+
+        //NEXT CODEBLOCK INCLUDES:
+        //Coversion method declaration with parameters
+        //Coversion formula
+        //format conversion with DecimalFormat data type
+        //return it all
+
+        public static double converter(double setInitialAmount, double initialCurrency, double targetCurrency)
+        {
+            double converted = (setInitialAmount/initialCurrency) * targetCurrency;
+
+            DecimalFormat roundDecimalTwoPlaces = new DecimalFormat("#.00");
+
+            return Double.parseDouble(roundDecimalTwoPlaces.format(converted));
+
+        }
+
+
+
+
+    }
+
diff --git a/src/main/java/DELETEME b/src/main/java/DELETEME
deleted file mode 100644
index e69de29..0000000
diff --git a/src/test/java/CurrencyConversionTest.java b/src/test/java/CurrencyConversionTest.java
new file mode 100644
index 0000000..319596e
--- /dev/null
+++ b/src/test/java/CurrencyConversionTest.java
@@ -0,0 +1,116 @@
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.Assert;
+import java.util.Map;
+
+
+
+public class CurrencyConversionTest {
+
+
+
+public double setInitialAmount;
+
+@Before
+public void setup(){
+
+    setInitialAmount = 1.00;
+
+    }
+
+    //1
+    @Test
+    public void usdToEuro()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.USD, CurrencyConversion.EURO);
+        double expected = 0.94;
+        Assert.assertEquals(expected, actual, .001);
+    }
+
+    //2
+    @Test
+    public void britishPoundToIndianRupee()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.BRITISH_POUND, CurrencyConversion.INDIAN_RUPEE);
+        double expected = 83.32;
+        Assert.assertEquals(expected, actual, .001);
+    }
+
+    //3
+    @Test
+    public void australianDollarToCanadianDollar()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.AUSTRALIAN_DOLLAR, CurrencyConversion.CANADIAN_DOLLAR);
+        double expected = 0.98;
+        Assert.assertEquals(expected, actual, .001);
+    }
+
+    //4
+    @Test
+    public void singaporeDollarToSwissFranc()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.SINGAPORE_DOLLAR, CurrencyConversion.SWISS_FRANC);
+        double expected = 0.71;
+        Assert.assertEquals(expected, actual, .001);
+
+    }
+
+    //5
+    @Test
+    public void malaysianRinggitToChineseYuanRenminbi()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.MALAYSIAN_RINGGIT, CurrencyConversion.CHINESE_YUAN_RENMINBI);
+        double expected = 1.55;
+        Assert.assertEquals(expected, actual, .001);
+
+    }
+
+    //6
+    @Test
+    public void japaneseYenToChineseYuanRenminbi()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.JAPANESE_YEN, CurrencyConversion.CHINESE_YUAN_RENMINBI);
+        double expected = 0.06;
+        Assert.assertEquals(expected, actual, .001);
+    }
+
+    //7
+    @Test
+    public void euroToSwissFranc()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.EURO, CurrencyConversion.SWISS_FRANC);
+        double expected = 1.07;
+        Assert.assertEquals(expected, actual, .001);
+    }
+
+    //8
+    @Test
+    public void canadianDollarToSwissFranc()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.CANADIAN_DOLLAR, CurrencyConversion.SWISS_FRANC);
+        double expected = .77;
+        Assert.assertEquals(expected, actual, .001);
+    }
+
+    //9
+    @Test
+    public void japaneseYenToIndianRupee()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.JAPANESE_YEN, CurrencyConversion.INDIAN_RUPEE);
+        double expected = .59;
+        Assert.assertEquals(expected, actual, .001);
+    }
+
+    //10
+    @Test
+    public void malaysianRinggitToUsDollar()
+    {
+        double actual = CurrencyConversion.converter(setInitialAmount, CurrencyConversion.MALAYSIAN_RINGGIT, CurrencyConversion.USD);
+        double expected = .22;
+        Assert.assertEquals(expected, actual, .001);
+
+    }
+
+
+
+}
diff --git a/src/test/java/DELETEME b/src/test/java/DELETEME
deleted file mode 100644
index e69de29..0000000
diff --git a/target/classes/CurrencyConversion.class b/target/classes/CurrencyConversion.class
new file mode 100644
index 0000000..855b611
Binary files /dev/null and b/target/classes/CurrencyConversion.class differ
diff --git a/target/test-classes/CurrencyConversionTest.class b/target/test-classes/CurrencyConversionTest.class
new file mode 100644
index 0000000..87dd415
Binary files /dev/null and b/target/test-classes/CurrencyConversionTest.class differ