Merge in the node stuff