* Overhauled filters to be easy to extend (as long as they stay pill buttons...)
* Broke out the filter macros separately so you can pick and choose and extend them