Includes updates from 10/3.  About to put in final touches.