Andrew

merged #edit branch and #new branch