Same as commit from just a few minutes ago- but with a lot of extraneous
commented-out to-be-deleted sections deleted.  Note that debugging print
statements are still present (in this and the last several commits).