If rizzo

@mriddle Quick sanity check? I'll merge when I finalise a few bits with Rizzo. Cheers.