Notification migration

With temporary code to delete