Almost finished new config system