WIP added filters and tests