Started to add more spawn logic