-Getting closer to the filter stuff working