work in progress on data source