Notification View -- will break cause need to merge the models