added support for payment method selection (WIP)