Feature/bulk deliveries