Adapt donor comms to use single location field #250

See #250