Work towards adding events