refs #97: This solution should address all concerns from the review.