Developer - Kyle: What's this?

Merge all of the filtering to the master branch