diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java
index 6498351..3ab7d6e 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java
@@ -2,6 +2,6 @@
 
 public interface ConvertableCurrency {
     default Double convert(CurrencyType currencyType) {
-        return Double.MAX_VALUE;
+        return (currencyType.getRate() / currencyType.getTypeOfCurrency(this).getRate());
     }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
index 9acf5e8..d7fdc90 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
@@ -25,6 +25,15 @@ public Double getRate() {
     }
 
     public static CurrencyType getTypeOfCurrency(ConvertableCurrency currency) {
+        for (CurrencyType value : CurrencyType.values()){
+            String oldMoney = value.name().replace( "_", "" );
+            String newMoney = currency.getClass().getSimpleName();
+
+            if (oldMoney.equalsIgnoreCase(newMoney)) {
+                return value;
+            }
+        }
+
         return null;
     }
 }
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/ConvertableCurrency.class b/target/classes/io/zipcoder/currencyconverterapplication/ConvertableCurrency.class
index 0c98dc2..1ffa8bf 100644
Binary files a/target/classes/io/zipcoder/currencyconverterapplication/ConvertableCurrency.class and b/target/classes/io/zipcoder/currencyconverterapplication/ConvertableCurrency.class differ
diff --git a/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class b/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class
index 8bd897e..527d81e 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/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