fix movement and move highlighting to work together
wip ~~modularity~~