Add proper channel locking around the uses of datastore_add and _find. There