Want to merge #1194 and use the new ellipsoid options here?