Move to Game.GetValidTeams and add Team.GetCore extension method Add BaseGenerator for others to derive from with common logic Update all generators to spawn items and update test world