Working on notifications
Working on views