Moving code around, also created new MainMenu class