More refactoring, redefining game purpose a little bit and reigning in the scope