First try at full encryption process
Encryption fixes