Submit views fleshed out
merge