Just about done fixing hashset bugs