Offer flow

Merge working end to end flow