Update #325 - First cut at switching over to new hash