Even more work on api pipe.