First pass for issue #405 - DesJarlais (R-TN)