Add move logic, but not finish.