Finished movement logic
Merge remote-tracking branch 'origin/SagieBranch'