Revert "Revert "spawning-waves finished""

This reverts commit 7b26fd8034787f68512f5d2cfa318b9a9b9bac25.