refs #6: name change, and added a comment
refs #6: refactor, comments, skip tests, all based on review