Almost done with notification parsing