Straight_line working
Final version for base_motion
Merged Will and Pierre