Aoife 17apr

Stuart's attempt to get a merged version based on He approx.