more games controller refactor