Ok
More refactoring. Spawner with base class