Preliminary commit of work to overhaul the configuration system