Game ends and such
Merge conflicts