shuffle stuff around, allow for main config