WIP: new descriptor tree