Made some progress on the notifications