Moving more code around getting ready to code the login window