Added the notification manager
9 files changed