Done except that spaces need to be added back in Decryptor
Spaces need to added back