checking in Mark's version 1.1 files (with my original changes included).