Added a bunch of encryption