NEB-2689: Kaleb's Links