More work on renderer