Change to creating argv/argc