Major refactoring in progress, about to add new subtree