Started changing shipping functionality over to delivery service convention. TRAD-51 #time 1h 20m