Game impl

How do you manually merge branches? It's mostly the new JSON stuff that has to be merged, I think.