Rewrites old notification list wrapper, event support renames
Some refactoring modifications that got away