First pass at a non-trivial example.
Merge branch 'nontrivialexample'