Commit #16
Continued adding advance functionality to edit.