Actually integrate all the stuff

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