Add match up class and tests