WIP Starting upgrade to use the new conf files.