WIP: combine tree stuff