- revert back from class based data sources to floating fetch fn
- initial reason to move to classes is not longer required, so simpler
function based implementation is desireable