WIP views
Merge branch 'master' into erik-views