More generic checking solution now - still need to handle cows.  Possibly set union might help