Fixed comment issue.  Changed version to 4 to indicate it is mostly done.