WIP major notification routing refactor