Partaways through rendering rewrite and refactor