More progress - for Troy to look at.