initial
merge commit
added views to jems
merge conflict