Started refactoring move method.