Notification queue refactoring complete?