moving things to config