NEB-1590: Torie's Links