Reorganized some more and found partial send bug