I think this is the direction

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