Rewrite based upon Cale's review feedback.