Work in progress on IL datasource