Encryption

Should be ready to merge and find out what I broke.