Better dataService & linking to task DB