Completion of notification service, as well as several other additions
and changes.