Fixed earlier screw ups
Made expand work