Basic encryption working
Merge branch 'AddEncryption' into develop