Using new TF editor - not yet finished.