Updated code

Updated more of the hashing code. Nothing solid yet (can't synthesize).