Decoupled code retested, need more tests
Fixed Cryptography Class