Runtime filtering

Ran all tests and they haven't been broken.