Move generic notification stuff to Notifier