Work on #578
Now aborts treating if target moves.
Merge branch 'master' of http://github.com/KoffeinFlummi/AGM