Progress on new config system