Related to #60. Implemented move properly.