WIP ENH: Add hashing