changes to new sign up, not working yet
unmerged files of mine = nothing goes wrong