move iDataSource to own header file,