implement better support for retries with custom keys
Add Hamms server name to everything
add server header test