Preparing refactoring - the plan is moving logic from the gamestate
loading to where it will eventually belong.