Pushing some preliminary changes to the EditView.
Merge Conflicts