Add utilities for handling matches and some tests.
Add the updated notebook.
Add a test file.