Adds some extra filters and a way to combine filters.

Also adds documentation and testing.