WIP #3

Remove/update Notifier