This is just a rename of c -> card (local var), want me to pull it into a cleanup branch to merge first?