More simple refactoring; starting to set up the welcome screen stuff