Updated a lot with the notification and confirmation.
More testing needs to happen but this is a reference point I need to get updated