Even more tree gen work

Still broken, but closer to looking like it wants to pretend to be a
tree, at least