In progress: refactoring 'Add new Event' functionality