Continue adding filters pt2; incomplete