More work on game stuff