CAP-0597: Eleanor's Links