More work on filters
Merge branch 'master' of https://github.com/OCNScrim/Scrimmage3