Unfinished changes for TestGame