EditEvent, 1st try
merge
event edit improvements
Merge