Now discarding cards animates properly.  I also changed the way cards
are accessed and added a few other things.