diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..c0c4751
Binary files /dev/null and b/.DS_Store differ
diff --git a/Cipher.java b/Cipher.java
index 7527c5b..33e220e 100644
--- a/Cipher.java
+++ b/Cipher.java
@@ -15,7 +15,7 @@ public String encrypt(String inputString) {
         // for all chars in the input string
         for (int i = 0; i < inputString.length(); i++)   
         {
-
+            outputString += replaceChar(inputString.charAt(i), true);
         }
 
         return outputString;
@@ -25,6 +25,11 @@ public String decrypt(String inputString) {
         
         // output string will be collected in this variable, one char at a time
         String outputString = "";
+
+        for(int i = 0; i < inputString.length(); i++){
+            outputString += replaceChar(inputString.charAt(i), false);
+
+        }
         
         replaceChar('a',true);
         
@@ -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);
                 }
             }
         }