finally sorted the node stuff