got calculations working

finished doing the calculations, all the numbers appear to be correct.