I was hoping that an Account-managing client would resolve this better than Amethyst, but maybe we will have to offer something as well.