finish move to config struct