Render refactor WIP