Finished move logic...
Merge remote-tracking branch 'origin/SagieBranch'