refs #65 #67 "added new module to reduce duplication"