Refactor to allow for game menu