Features/filters everywhere

replacing PR #40. Hopefully this is cleaner.