merge with event delete/get
tried to add security
cleanup