Animal Farming Overhaul

Currently, I see the way we farm and breed animals in Minecraft to be bland and overly cruel. Previously mojang have shown that they want to promote a positive image for animals and nature alike - however the simplicity of the animal breeding and farming system is ironically cruel. The average player simply overbreeds their animals whilst cramming them into a small pen, so I propose the following changes:

FOOD AND WATER:

Animals need food and water to survive, much like us. This could be solved with a new item - the "trough" which could be crafted with any wood type. The trough could be filled up with water to allow animals the chance to drink, however it would have to be refilled occasionally.

Most animals eat grass, so they could require sufficient grass in their enclosure

ANIMAL HAPPINESS:

Happier animals should be more rewarding - perhaps dropping more than unhappier animals.

Happiness can be increased through giving the animals more space, food and water.

NEW TRANSPORT

Transporting animals can be a real pain with leads - so a new item could be added: the Wagon. It could be crafted with logs and iron and attach to a donkey. The wagon could carry 2 animals similarly to a boat, or 2 players however the wagon would slow the donkey down.