dev (get AddMatch working and tested)