Squash this
#26 Major refactor - password verify separated into it's own file unit and neatened up considerably