Need to get back on this.  Starting to refactor the data provider.