Move to csv, add unstacked output, make second argument optional