working on event-request/email
fixing conflicts merging work