NEB-2391: Charlie's Links