View in place and meets spec
Merge branch 'view_test' into development