RUNS: Small refactor, and movement change, which doesn't work yet.