Also snapshot the agos-new.
More TODO thoughts.