Refactor Operations into Notifications, at least somewhat