Final steps

These are the last iterations of the matchers project, the most recent
version being the fully working edition.