First commit of notifications branch
Notifications support finalised