Breaking out config more...