Begun rewrite of creep spawn code