Master no longer has filter related items

Not a fan that github somehow merged my changes w/o my permission, so
stuff I'm still working on has been taken out