Shuffle some code around to make things cleaner.
More work on login for "guest" and "who"

Still needs additional work but it's better...