new event almost working
edit popover working