Add matching: option
Work in progress