Little more work on spawn class