[refactoring] scratch out filters, some more structure