Made more progress. Converted some of the calculations to methods.