Stepping away from Filter.cs

Attempting to make a single filter method in lieu of multiple.