Add Encryption
Still not fully tested