Nick: more work on CardHand.java