WIP: start working towards extensions, starting with the tree