new stuff all working, about to move old stuff to attic