working progress on notifications