Working On Encryption
Merge branch 'Encryption-Test'
Giving up on encrypt for now
Merge branch 'Encryption-Test'