More work on getting data exchange to work