Changed SpawnShapes to ShapeSpawner
Merging