Working on AddIn/Notification