most of what I wanted

Signed-off-by: Michael Donaghy <md401@srcf.ucam.org>