Some thrashing, getting matching to work the way I want.
release 0.1.17