WIP: features/subtrees