Making progress on add/undo block...