Made Simulator a singleton, left some of the changes to the team.