Notification manager

See commit comments