Features/update notification

Ready for merge. 

There may still be some minor changes later on, but I will create a new PR then.