CR - Break up a long line.  Please leave the branch for me to squash/rebase.