Jarv/config refactor wip