WIP refactoring.  See config2.yaml.