Reworked notifications in prep of custom notifications