Initial fix for filtering. expecting merge conflicts
Call me the human-computer relationship manager. Conflicts merged