progressing on dataservice refactor