data extended
Merged stuff
tree working