Worked more on the calculations. It's comming along nicely.