Encryption moved to Client; new adding of clients stuff commented out