jcmfile

Jane's additions to the merged file.  :100: