Begin adding views
Refactor