More work on Renderer