Filtering + refactor
Merge branch 'main_task' of github.com:Nozdi/shmir into main_task