WIP better notifications