Working on filter code
More filter code
Fixing small bug