Add match and some tests (not done).