jon's thanksgiving meeting changes
merged peter and my Thanksgiving edits