Partial changes for xfr
More transfer stuff
Fix transfer