diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java
index 6498351..806af15 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java
@@ -2,6 +2,8 @@
 
 public interface ConvertableCurrency {
     default Double convert(CurrencyType currencyType) {
-        return Double.MAX_VALUE;
+        return currencyType.getRate()/this.getType().getRate();
     }
+
+    CurrencyType getType();
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
index 9acf5e8..3fabd33 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
@@ -25,6 +25,18 @@ public Double getRate() {
     }
 
     public static CurrencyType getTypeOfCurrency(ConvertableCurrency currency) {
-        return null;
+
+        return currency.getType();
     }
 }
+
+//        for (CurrencyType type : CurrencyType.values()) {
+//            String original = type.name();
+//            String newCurrency = currency.getClass().getSimpleName();
+//            if(original.equalsIgnoreCase(newCurrency));
+//        }  return type;
+//        }
+//        }
+//        return 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..2d36dfb 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java
@@ -1,6 +1,14 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class AustralianDollar implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.AUSTRALIAN_DOLLAR;
+
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java
index 8d4ee7e..43abb3e 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java
@@ -1,6 +1,14 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class CanadianDollar implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.CANADIAN_DOLLAR;
+
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java
index 475596f..7840b48 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java
@@ -1,6 +1,14 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class ChineseYR implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.CHINESE_YR;
+
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java
index 7ad00b5..58bda38 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java
@@ -1,6 +1,13 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Euro implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.EURO;
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java
index 502f0c3..1e19e75 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java
@@ -1,6 +1,14 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Franc implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.FRANC;
+
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java
index 7879ab1..191bd3a 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java
@@ -1,6 +1,13 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Pound implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.POUND;
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java
index d3c30d8..278854d 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java
@@ -1,6 +1,13 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Ringgit implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.RINGGIT;
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java
index 2d05af5..9a3e5b1 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java
@@ -1,6 +1,13 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Rupee implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.RUPEE;
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java
index 3b5489e..9b5cd37 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java
@@ -1,6 +1,14 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class SingaporeDollar implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.SINGAPORE_DOLLAR;
+
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java
index 7d6253c..39cc078 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java
@@ -1,6 +1,13 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class USDollar implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.US_DOLLAR;
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java
index 5d3b9f4..dd8f238 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java
@@ -1,6 +1,14 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class UniversalCurrency implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.UNIVERSAL_CURRENCY;
+
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java
index b871937..2cd9d4b 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java
@@ -1,6 +1,14 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Yen implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.YEN;
+
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }
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..c2bc78a 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..d33c93a 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..cb240c2 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..03f03a9 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..e5c3254 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..7bdb66c 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..c31d6af 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..91187ef 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..3fddf75 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..07a7279 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..2602249 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..c334823 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..2489b20 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..8855578 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