More work on new renderer.