More refactoring to rendering path, still work in progress