Starting to add filter support - not yet working