Added prepare move command. Changed some of the behaviour of the move command. Closes #41