Added spawner logic
Merge remote-tracking branch 'origin/Structure' into Structure