Continue work on spawn logic