more configuration datamodel work
port a lot of things to the new configuration system