trying to move delivery context into another file