Encryption support (Take 3)!

Third time's the charm folks! Encryption is now working 100%!