WIP (closer to proper capath and hierarchical support)