notifications, snooze
merge brians changes