Code for handling unicode/punycode name conversions v2

Opening new PR for clean commenting
Ah, right :) as I said above I just did it.