swith to single OnsiteDataSource, remember lesson from before, no state in the database interface itself