Begun working in the expand command