Added some basic stuff for new spawning