Draft: Refactor - progress

Blodgett, David L. requested to merge refactor into main Nov 25, 2024