added login change
added more login stuff
this sucks
merge stuff