More stuff that works. Now with login.
Merge remote-tracking branch 'origin/master'