Control flow working - need to modify the config read part