Continuing work on new example

More work on the new example, as well as fixing a few bugs and adding
functionality.