Added refractored code combining oil and gold and CPI data for inflation adjustment