Updating Encryption, adding functionality to client and server