Some more work on renderer