Sounds good, This probably goes along with `2` in my `6` suggested changes above.