More work on new renderer, starting to work now.