move most of the config into core