I was planning to do the filter stuff, together, as a separate PR.

I think it will involve changes beyond the scope of this PR