Updated notification service, need to just add a small piece, then
complete