Refactor out helper methods to follow a more modelistic approach to filter parsing
Refactor out helper methods to follow a more modelistic approach to filter parsing

patrickreynolds/toner,patrickreynolds/toner