Encryption now works, huzzah! Commiting before I break anything...

Going to clean up the code and stuff now that encryption works.