WIP: new transfer utilies, and cleanups.