Work on undo. Seems to work now.