diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java
index 6498351..bc14a3e 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.getCurrencyType().getRate(); // return Double.MAX_VALUE;
     }
+
+    CurrencyType getCurrencyType();
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
index 9acf5e8..b1d7050 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java
@@ -25,6 +25,6 @@ public Double getRate() {
     }
 
     public static CurrencyType getTypeOfCurrency(ConvertableCurrency currency) {
-        return null;
+        return currency.getCurrencyType();
     }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java
index 7ff9427..cd93106 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) {
+        return ConvertableCurrency.super.convert(currencyType);
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.AUSTRALIAN_DOLLAR;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java
index 8d4ee7e..6a6a5e9 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java
@@ -1,6 +1,16 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class CanadianDollar implements ConvertableCurrency {
+    @Override
+    public Double convert(CurrencyType currencyType) {
+        return ConvertableCurrency.super.convert(currencyType);
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+      return CurrencyType.CANADIAN_DOLLAR;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java
index 475596f..01c1fab 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java
@@ -1,6 +1,15 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class ChineseYR implements ConvertableCurrency {
+
+
+  @Override
+  public CurrencyType getCurrencyType() {
+      return CurrencyType.CHINESE_YR;
+  }
+
+
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java
index 7ad00b5..983827a 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java
@@ -1,6 +1,16 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Euro implements ConvertableCurrency {
+    @Override
+    public Double convert(CurrencyType currencyType) {
+        return ConvertableCurrency.super.convert(currencyType);
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.EURO;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java
index 502f0c3..ddbaf8c 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java
@@ -1,6 +1,16 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Franc implements ConvertableCurrency {
+    @Override
+    public Double convert(CurrencyType currencyType) {
+        return ConvertableCurrency.super.convert(currencyType);
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.FRANC;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java
index 7879ab1..c935706 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java
@@ -1,6 +1,16 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Pound implements ConvertableCurrency {
+    @Override
+    public Double convert(CurrencyType currencyType) {
+        return ConvertableCurrency.super.convert(currencyType);
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.POUND;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java
index d3c30d8..cdbde76 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java
@@ -1,6 +1,16 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Ringgit implements ConvertableCurrency {
+    @Override
+    public Double convert(CurrencyType currencyType) {
+        return ConvertableCurrency.super.convert(currencyType);
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.RINGGIT;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java
index 2d05af5..ac329bd 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java
@@ -1,6 +1,16 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Rupee implements ConvertableCurrency {
+    @Override
+    public Double convert(CurrencyType currencyType) {
+        return ConvertableCurrency.super.convert(currencyType);
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.RUPEE;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java
index 3b5489e..9b119f9 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java
@@ -1,6 +1,16 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class SingaporeDollar implements ConvertableCurrency {
+    @Override
+    public Double convert(CurrencyType currencyType) {
+        return ConvertableCurrency.super.convert(currencyType);
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.SINGAPORE_DOLLAR;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java
index 7d6253c..2147e3f 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java
@@ -1,6 +1,17 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class USDollar implements ConvertableCurrency {
+
+    public USDollar(){
+
+    }
+
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.US_DOLLAR;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java
index 5d3b9f4..53d7b21 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java
@@ -1,6 +1,16 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class UniversalCurrency implements ConvertableCurrency {
+    @Override
+    public Double convert(CurrencyType currencyType) {
+        return ConvertableCurrency.super.convert(currencyType);
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.UNIVERSAL_CURRENCY;
+    }
 }
diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java
index b871937..8acf76e 100644
--- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java
+++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java
@@ -1,6 +1,21 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Yen implements ConvertableCurrency {
+
+
+    public Yen() {
+
+    }
+
+    {
+
+    }
+
+    @Override
+    public CurrencyType getCurrencyType() {
+        return CurrencyType.YEN;
+    }
 }
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..a5052eb 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..b246fe4 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..780900c 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..17fffe7 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..8423f3f 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..365996f 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..b790853 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..3af2b2c 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..7026864 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..bc817dd 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..18e3317 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..3375fb5 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..690380a 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..b90e810 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