Improved the way Notifications are handled. Still a WIP