added the notification stuff, not working yet...