start on filtering
merge
finally got some stupid ass type filters working
Merge branch 'master' of github.com:thomasjmwb/bbbbbbbbbbbbbbb