Notify-listen refactoring

Just a draft so far. Apparently, it passes all the tests but more tests is needed to cover new api.