Figured out a way to make filters work.  Might need a different approach later, but so far this seems legit.  Cleaned up a tad bit of code, too