Updated Deck to use changes to Hand and User