middle of refactor of CliGame