Feature/filter

Adding filters and clean up