Got it working forwards, still need to do drilldown-object tracking and switching to preserve hierarchy