WIP
WIP
WIP - dataclean
WIP

some view testing