Progress regarding undo, but not there yet...