beginning rework of buy flow