initial changes, moved persistence code to separate classes, renames and took out unnecessary variables and removed unnecessary parameters
Merge branch 'master' of https://github.com/ianwisely/Refactoring