Updated NodeId.  Tests still to be completed.