First cut on the snippets for bug #21.