More work on adding order payments with dynamic values