It paints now but still not moving
Merge origin/master