Jarv/config refactor wip

I think it's a good idea but prob. not for this PR