NEB-3905: Kirk's Links