begins to refactor views to account for units