start of new config handling stuff
6 files changed