Tested and corrected mechanics/calculate-movement