First Draft Complete

For comments from David and Zhiyi