Beginning of notification processing refactor