WIP on fixing config