Condensed everything into one GameScreen, which had instances of everything World and Battle (and eventually Menu)
Made all associated changes