refactor - notifications v2
Update unit tests
create todo list