Experimental changes I’m about to blow away.
Ah, much cleaner now that there is real tree structure in place.