On step payment you choosing a payment method, this is where it is stored currently. I think this part should be reworked but I do not know how? It should be discussed.