Filtering added. Still WIP