Baseline partway through rewrite for new configuration method.
Rewrote configuration.