Cleanup render_node
WIP
More baked

Now with more genericness.