Still working on the login.
Merge branch 'stuff'