Start to refactor out renderer.y