Progress on new filter system
More progress on filters