Interim commit, working on getting asynchronous notifications working
Notifications are now correctly delivered