Shouldn't this go to the order index?