Added a structure for the tree we use.
At this point, thanks to the new tree API, we are getting the same results as master. Time for a merge.