Some work splitting out/cleaning up examples