Merged it up and it's kinda playable.

Bit weird when you refresh the screen
and I don't like the delay on the game select page
I've also had the auth stuff crash a few times but I don't know why