Cloning WiP
#CHANGE: Tweaked cloning performance and added diagnostics code.