Undo is working(ish)