wip. everything works. going for 'add tree' now.
wip. everything probably works.
fixup
wip. everything works except add-tree, which mostly works.