Addressed some recommendations made by wvu-r7. Need to remove some comments, add reporting, etc.