Got first piece of the filter persistence working