Rebased on master
Code done, but broken due to weird branch behaviour
Clean again, all unit tests passed
Filters implemented, integrated and unit tests passing.  Feature complete.