We're currently tracking in terms of deliver_by (which is simply ship_by + 5) Migrate everything to ship_by and display that everywhere we can