Pulled in files from zip folder, working on UsersDAO
minor cleanup