Revert "Some finished game message work"

This reverts commit f2b3efae156a92774d492a2f19cc6462a10e1b0f.
Revert "Revert "Some finished game message work""

This reverts commit aa6cf0ea0fc72bd73c63e6b73ae8015e3bbbfcf0.
Auxiliaries do not overlap