Work in Progress.
About to combine views.