Developer

Merge all of the filtering to the master branch