addMatch() removeMatch() implemented, not tested