Partly refactored move and broke it.