A few more steps toward isolating config (odd bug at one point, so doing in steps)