More work in progress.  Trying to squish the re-login issue now.