Refactored some deliveries code, about to start on truck_graph