Attempt at filtering

DO NOT MERGE YET