WIP #4

Adding CNAME back