My sub highlight #1295

Same here as above.  This isn't much work and we will be better off for just taking care of it now.  I'm fine with you opening up another PR to restrict the PR size, but should do so now, not later