Working on edit mark function
midmerge
Merge branch 'master' into BetterTommorrow