Organized sheathed rendering into the API
Fixes
Merge remote-tracking branch 'upstream/master'