Additional work on validators/calculators and initial work on control locations and sections.