M-2496: Happi's Links