switches data source functionality to conform to objective-c standards
removes less detailed delegate method
Merge branch 'feature/data_source_improvements' into develop