Dominic Johnson, University of Edinburgh