Progress on having the expansion decks

More progress on allowing multiple decks per game.