initial OH datasource work