Getting ready for tentative,
remove add minor bug
Getting ready for RedoUndo (Command Pattern)