NEB-1445: Bun's Links