worked on views
refactored views and partials
biggest merge conflict in the history of phovec