diff --git a/pom.xml b/pom.xml
index 682d6db..f7e57e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,5 +10,15 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <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/Converter.java b/src/main/java/Converter.java
new file mode 100644
index 0000000..1328ffa
--- /dev/null
+++ b/src/main/java/Converter.java
@@ -0,0 +1,14 @@
+public class Converter {
+
+
+    static double convertCurrency(double from, double to){
+        return convertToDollar(from) * to;
+    }
+    static double convertToDollar(double from){
+        return ExchangeRates.USDollar / from;
+    }
+//    static double convertFromDollar(double to){
+//        double targetAmount = to / ExchangeRates.USDollar;
+//        return targetAmount;
+//    }
+}
diff --git a/src/main/java/DELETEME b/src/main/java/DELETEME
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main/java/ExchangeRates.java b/src/main/java/ExchangeRates.java
new file mode 100644
index 0000000..4269216
--- /dev/null
+++ b/src/main/java/ExchangeRates.java
@@ -0,0 +1,29 @@
+
+public class ExchangeRates {
+
+    final static double USDollar = 1.00;
+    final static double Euro = 0.94;
+    final static double BritishPound = 0.82;
+    final static double IndianRupee = 68.32;
+    final static double CanadianDollar = 1.32;
+    final static double SingaporeDollar = 1.43;
+    final static double SwissFranc = 1.01;
+    final static double MalaysianRinggit = 4.47;
+    final static double JapaneseYen = 115.84;
+    final static double ChineseYuanRenminbi = 6.92;
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/java/ConverterTest.java b/src/test/java/ConverterTest.java
new file mode 100644
index 0000000..fbdfdcc
--- /dev/null
+++ b/src/test/java/ConverterTest.java
@@ -0,0 +1,90 @@
+import org.junit.Test;
+import org.omg.CORBA.CODESET_INCOMPATIBLE;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertTrue;
+
+public class ConverterTest {
+
+    @Test
+    public void convertToDollarTest(){
+        //Euro to Dollar
+        double expected = 1.06;
+        double actual = Converter.convertToDollar(ExchangeRates.Euro);
+        assertEquals(expected, actual, 0.5);
+        }
+//    @Test
+//    public void convertFromDollarTest(){
+//        double expected = 0.94;
+//        double actual = Converter.convertFromDollar(ExchangeRates.Euro);
+//        assertEquals(expected, actual);
+//    }
+    @Test
+    public void convertCurrencyTest2(){
+        //Dollar to Euro
+        double expected = 0.94;
+        double actual = Converter.convertCurrency(ExchangeRates.USDollar, ExchangeRates.Euro);
+        assertEquals(expected, actual);
+        }
+    @Test
+    public void convertCurrencyTest3(){
+        //Euro to BritishPound
+        double expected = 0.86;
+        double actual = Converter.convertCurrency(ExchangeRates.Euro, ExchangeRates.BritishPound);
+        assertEquals(expected, actual, 0.5);
+        }
+    @Test
+    public void convertCurrencyTest4(){
+        //British Pound to Indian Rupee
+        double expected = 83.32;
+        double actual = Converter.convertCurrency(ExchangeRates.BritishPound, ExchangeRates.IndianRupee);
+        assertEquals(expected, actual, 0.5);
+        }
+    @Test
+    public void convertCurrencyTest5(){
+        //Indian Rupee to Canadian Dollar
+        double expected = 0.02;
+        double actual = Converter.convertCurrency(ExchangeRates.IndianRupee, ExchangeRates.CanadianDollar);
+        assertEquals(expected, actual, 0.5);
+        }
+        @Test
+    public void convertCurrencyTest6(){
+        //Canadian Dollar to Singapore Dollar
+            double expected = 1.08;
+            double actual = Converter.convertCurrency(ExchangeRates.CanadianDollar, ExchangeRates.SingaporeDollar);
+            assertEquals(expected,actual, 0.5);
+        }
+        @Test
+    public void convertCurrencyTest7(){
+        //Singapore Dollar to Swiss Franc
+            double expected = 0.71;
+            double actual = Converter.convertCurrency(ExchangeRates.SingaporeDollar, ExchangeRates.SwissFranc);
+            assertEquals(expected, actual,0.5);
+        }
+        @Test
+    public void convertCurrencyTest8(){
+        //Swiss Franc to Malaysian Ringgit
+            double expected= 4.43;
+            double actual = Converter.convertCurrency(ExchangeRates.SwissFranc, ExchangeRates.MalaysianRinggit);
+            assertEquals(expected, actual,0.5);
+        }
+        @Test
+    public void convertCurrencyTest9(){
+        //Malaysian Ringgit to Japanese Yen
+            double expected = 25.91;
+            double actual = Converter.convertCurrency(ExchangeRates.MalaysianRinggit, ExchangeRates.JapaneseYen);
+            assertEquals(expected, actual,0.5);
+        }
+        @Test
+    public void convertCurrencyTest10(){
+        //Japanese Yen to Chinese Yuan Renminbi
+            double expected = 0.06;
+            double actual = Converter.convertCurrency(ExchangeRates.JapaneseYen, ExchangeRates.ChineseYuanRenminbi);
+            assertEquals(expected, actual,0.5);
+        }
+
+
+
+
+
+}
diff --git a/src/test/java/DELETEME b/src/test/java/DELETEME
deleted file mode 100644
index e69de29..0000000
diff --git a/target/classes/Converter.class b/target/classes/Converter.class
new file mode 100644
index 0000000..b4908f1
Binary files /dev/null and b/target/classes/Converter.class differ
diff --git a/target/classes/ExchangeRates.class b/target/classes/ExchangeRates.class
new file mode 100644
index 0000000..1a85fd1
Binary files /dev/null and b/target/classes/ExchangeRates.class differ
diff --git a/target/test-classes/ConverterTest.class b/target/test-classes/ConverterTest.class
new file mode 100644
index 0000000..2d5f6bf
Binary files /dev/null and b/target/test-classes/ConverterTest.class differ