Extensive updates to node set and node relationship to manage "Current ..." in UI. Updates to UI to accomodate new backend.
Resolved merge conflict manually.