Issue 25

Updates to the comments and PR are forthcoming.