Completed initial code for config system cutover. Not tested yet. Also the import...