more fiddling about.
More refacotoring.