Card and Deck both now work properly