Added stuff to models files.  Commented out something in Card.m