diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/.DS_Store differ
diff --git a/Cipher.java b/Cipher.java
index 7527c5b..c2d0ef1 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,9 +25,10 @@ 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++)
+        {
+            outputString += replaceChar(inputString.charAt(i),false);
+        }
         return outputString;
     }
 
@@ -42,7 +43,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);
                 }
             }
         }
diff --git a/CipherTest.java b/CipherTest.java
index 2f6ac6b..3bb5e91 100644
--- a/CipherTest.java
+++ b/CipherTest.java
@@ -10,6 +10,7 @@ public static void main(String[] args)
         
         String text1_encrypted = cipher.encrypt(text1);
         String text1_decrypted = cipher.decrypt(text1_encrypted);
+        
 
         System.out.println("Original Text: " + text1);
         System.out.println("Encrypted Text: " + text1_encrypted);