WIP: consolidating tree and a.a. change info