Moving config stuff around 3