Render refactor start w/tests