Lots of work on traits

Shearing and milking pretty much functional