Changes to Command and added Memento