Failed attempt at adding a new configuration system - hope I didn't
break anything.