WIP - rebuilt tree builder