Design refinement, implementation of formula, addition of tests. Renaming affecting multiple areas.