wip: reviewed config structure