add email notifications in progress ...