 Pulling Jeff's comments on #2216 into separate issues https://github.com/FoxComm/highlander/pull/2116#pullrequestreview-46060713 cc @jmataya