Improved moving
Ready for impl of history (undo,...)