add login function

and merge conflicts?