Organized sheathed rendering into the API
Fixes