MOAR work on notifications