start of dataview refactor
start of dataview refactor