Model rendering, continuing rendering refactor