First version of filter working (no persistence)