Upgrade WIP
Notification/mailer upgrade work.