Continued a bit of work on renderers

Just a bit more work, need to just sit down when I feel fine and work
this out.