There used to be an animal "skill" called Obedience. It's now called Guard. If it was called Obedience again, it would make a great base skill for implementing something like "don't run away from me when I'm trying to train you" or "I'm assigning you this animal bed" or "Guard me". Please, consider adding something like that. At least for the training part. Retraining haulers can get annoying at times.