More work on rendering system.