Added preliminary notification code. Not tested yet.