Adding basic filtering
Merge branch 'feature/filtering'