filtering works but doesn't look good
Merge branch 'master' of https://github.com/TheZallen/inHouse