Began a refactor for easier configuration management.