More refinement... node linking isn't done yet