Unfactor rotation out of move function into commands.
Fix collapse.