Monday commit, working on view and edit questions