Event edition

For #9