More refactoring work. Notification queue handling approaching usable.