Filter and strategy

First approach to filters and strategy
Merge branch 'master' of https://github.com/m2march/isw2