Adds edit status
Merge conflicts
Fixed testfn merge conflict break- jng