First draft of Zip plus minor Tuple changes/fixes