Cleaned up and CNAME working