Trying to get Notifications to work right

lots of changes
Trying to fix conflict issues