add delivery_time calculations, make them freezable