Fiona MacKay, University of Edinburgh