Holding off on pushing this until the dns mapping happens