initial rewrite of movement
added some more notes
Merge remote-tracking branch 'origin/master'