diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
index 9acf5e8..7fd742e 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
@@ -1,5 +1,7 @@
 package io.zipcoder.currencyconverterapplication;
 
+import java.util.Arrays;
+
 public enum CurrencyType {
     AUSTRALIAN_DOLLAR(2.70),
     CANADIAN_DOLLAR(2.64),
@@ -25,6 +27,12 @@ public Double getRate() {
     }
 
     public static CurrencyType getTypeOfCurrency(ConvertableCurrency currency) {
-        return null;
+        return Arrays.asList(CurrencyType.values())
+                .stream()
+                .filter(currencyType -> currencyType.name().replace("_", "")
+                        .equalsIgnoreCase(currency.getClass().getSimpleName()))
+                .findAny()
+                .orElse(null);
+
     }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java
index 7ff9427..6b73b08 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java
@@ -1,6 +1,17 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class AustralianDollar implements ConvertableCurrency {
+    @Override
+
+
+  public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.AUSTRALIAN_DOLLAR.getRate();
+       return result;
+    }
+
+
+
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java
index 8d4ee7e..bb627e5 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class CanadianDollar implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.CANADIAN_DOLLAR.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java
index 475596f..4007855 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class ChineseYR implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.CHINESE_YR.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java
index 7ad00b5..c8e906d 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Euro implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.EURO.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java
index 502f0c3..0b05993 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Franc implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.FRANC.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java
index 7879ab1..7313cb9 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Pound implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.POUND.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java
index d3c30d8..8e94415 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Ringgit implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.RINGGIT.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java
index 2d05af5..713e5b1 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Rupee implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.RUPEE.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java
index 3b5489e..a80b703 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class SingaporeDollar implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.SINGAPORE_DOLLAR.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java
index 7d6253c..8897c23 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class USDollar implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.US_DOLLAR.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java
index 5d3b9f4..6dea565 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class UniversalCurrency implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.UNIVERSAL_CURRENCY.getRate();
+        return result;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java
index b871937..68b5e16 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java
@@ -1,6 +1,11 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Yen implements ConvertableCurrency {
+    public  Double convert(CurrencyType currencyType) {
+        Double result= currencyType.getRate()/CurrencyType.YEN.getRate();
+        return result;
+    }
 }
diff --git a/target/classes/META-INF/tc-money-converter.kotlin_module b/target/classes/META-INF/tc-money-converter.kotlin_module
deleted file mode 100644
index 8fb6019..0000000
Binary files a/target/classes/META-INF/tc-money-converter.kotlin_module and /dev/null differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class b/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class
index 8bd897e..e1872a0 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class and b/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.class
index 80c91bb..6a5ee21 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.class
index 9e2f557..f589750 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.class
index 8a644a4..47d0229 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Euro.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Euro.class
index f85fa55..cbd407c 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Euro.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Euro.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Franc.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Franc.class
index bc13e2a..1b09381 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Franc.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Franc.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Pound.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Pound.class
index 647e7d3..01a2c1c 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Pound.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Pound.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Ringgit.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Ringgit.class
index da95811..96ae1cb 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Ringgit.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Ringgit.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Rupee.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Rupee.class
index ae647fa..c148f54 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Rupee.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Rupee.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.class
index e79707e..8c59a75 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/USDollar.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/USDollar.class
index cc8a288..1b886ec 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/USDollar.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/USDollar.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.class
index 0e1962b..d123651 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Yen.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Yen.class
index 67872df..144f6ba 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Yen.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Yen.class differ
diff --git a/target/test-classes/META-INF/tc-money-converter.kotlin_module b/target/test-classes/META-INF/tc-money-converter.kotlin_module
deleted file mode 100644
index 8fb6019..0000000
Binary files a/target/test-classes/META-INF/tc-money-converter.kotlin_module and /dev/null differ