Reverted Renderer implementation pre-issue #36