CNAME pull request again

When the time is right Taylor!