Downstream mostly complete, working on upstream now