Revert "Merge pull request #71 from dbeckwith/endGamev2"

This reverts commit 242b3b20a6c2ae523de306d2a7483f4a5ad49851, reversing
changes made to 95626f46abc4a8683b282fd5abcc9a336e7dea78.

Reverting merge with endgamev2 due to breaking code