Continued work for new delivery functionality. Cleaned up model and modified routes. TRAD-51 #time 1h 15m