master Updated crypto to support multiple users

Added the beginning of messaging.
Removed some old code.