Work in progress

*a lot of cleanup work
missed a file..
bugged
Working in progress
Merge remote-tracking branch 'origin/develop_spawning_system' into develop