Some fixes
Add a lot of game playing stuff
Add more stuff
Merge conflicts