Restructure handling of 780 and 785 and incorporate 580 linking notes