Nearly there on login ... committing just to make sure I don't lose a quasi-working version.