uhhh, lot's of stuff.  mostly dealing with login

i apologize now for committing to master and all the merge conflicts
this will cause, honestly it wouldn’t let me commit to a branch