Works!  Now to clean up the comments and comment out logging, then pull request to original author.