messy commit - started working on combined login for username + email