@jlsherrill & @daviddavis : addressing this in a separate PR.