Initial work at adding CNAME support

Still need to prevent infinite recursion