Feature/fancy tree

**WIP DO NOT MERGE**