more work on SecureChat