Factor out seperate views
Merge