Let's open a separate issue/PR for Quantity-ifying this module. It wasn't meant to be the subject of this PR.