NEB-1644: Baxter's Links