Lots of goodies, cleanup, and example work