draft 1

tony’s changes since mid-Oct.