checkin for kjd. First cut at multiple address returns and BOMBPROOFING