Started working on returning notifications properly