Moved some stuff around for expand-config