Submission/philip taylor

IMPORTANT: Once this submission is integrated, it is particularly important to run the link fixing script again.