Moved spawn to World class
Finished fixing spawn