Basic filtering working
Polished