tree_reader stuff
Merging features/integration into master.