Committing so I can merge this change to another branch to test message encryption/decryption