start of flag based refactor/fix to login