Refined nodes - implemented first pass on links