code reorg
don't require login right away