Started to fix deliveries index but need to push forward