Moved expand-config stuff around
Made expand-config work