Better notification handling, WIP