Major changes to Card Class