Game over now works, but this really needs a clean-up - perhaps a different branch to begin with?