diff --git a/Cipher.java b/Cipher.java
index 7527c5b..65e62d6 100644
--- a/Cipher.java
+++ b/Cipher.java
@@ -15,7 +15,8 @@ public String encrypt(String inputString) {
         // for all chars in the input string
         for (int i = 0; i < inputString.length(); i++)   
         {
-
+            char c = inputString.charAt(i);
+            outputString = outputString + replaceChar(c, true);
         }
 
         return outputString;
@@ -26,7 +27,11 @@ public String decrypt(String inputString) {
         // output string will be collected in this variable, one char at a time
         String outputString = "";
         
-        replaceChar('a',true);
+        for ( int i = 0; i < inputString.length(); i++)
+        {
+            char c = inputString.charAt(i);
+            outputString = outputString + replaceChar(c, false);
+        }
         
         return outputString;
     }
@@ -42,7 +47,7 @@ private char replaceChar(char inputChar, boolean isEncrypt) {
             for (int i = 0; i < ORIGINAL_ALPHABET.length(); i++)   
             {
                 if(ORIGINAL_ALPHABET.charAt(i) == inputChar) {
-
+                    return CIPHER_ALPHABET.charAt(i);
                 }
             }
         }