Add ability to ask for credit card number again
Refactor tokenization: move from payment to credit card