Notification+ESM working

Should show up under Survey_v3.1n.