log in stuff
ugh
please merge