[WIP] Changed to handle subdomain includes dots

#91