WIP on sudo transfer
Merge branch 'sudo-transfer'