CDB-4165 Fixed basic datasource stuff, now works up until the point of retrieving actual data