Did a whole bunch of work here but WIP with CommandTree.