updates - still failing tests, bookkeeping of links is the tricky part