More comments regarding motion
Some more TODO's added