More work on filters.  Moving the code downstairs.