refactor, mostly games controller