Comments working with Jon on issue #97
Comments working with Jon on issue #18