Welcome back Treecapacitator integration. *Hopefully* closes #130 completely