Rejiggered tree data structure again