working version with convergence.  also removed files accidently added
everything working except tests