everthing compiles, everything generic.  go thru and del dead code