WIP: New config system continued