CAP-1679: Cynthia's Links