starting changes to encryption, following a new

tutorial on wikipedia. if this stuff isnt working, roll back past this