Thanks again to Arash Esbati

Not all the way there, but I don't know what to do about the format
complaints.