Added the filters, draft #1.
Merge branch 'features/filters'