wip: yanked out nsa, added DataService