Started redesign of card class