feel like i've finished all views
Merge branch 'exp'