Update hashing impl
First cut at splitting things out properly
Avoid using md5