wip - start of refactoring data sets views..