Now handle moves correctly (one at a time)