working on notifications implementation