The code is already in production in summingbird -- best to keep the diff a complete move and then make functionality changes later, so the diffs are really clear.