Refactor of CardType to include value and some Buy phase changes