Initial extraction of Bus/NotificationQ (All tests PASS)