Refactor payment code-path

## Is your feature request related to a problem? Please describe.

The payment code-path is a little convoluted and not very extensible

## Describe the solution you'd like

Not sure!

## Implementation

Not sure!

## Describe alternatives you've considered

Not sure!

## Additional context

Not sure!
