Update notifications to send based off user settings and cancel when expected
Merge