Start of refactor to make editing mode and viewing mode more distinct.