Begin of refactor to begin adding game support.