Merge "Refactors and a potential public API for rendering"