Moved more stuff from spawn to other classes