Added notifications. Untested and unimplemented