Started implementing match filters