add in more of the hashname generation