The filter stuff should be a separate commit/PR.