Encryption support and full E2E

Encryption support and full E2E