WIP: New config system, continued again