Wip better notifications