we should probably try to reuse most of what is in addNotification, right ? how about extracting a common method?