Added in card generation
Added shuffling, and testing