Mostly done. Now integrating testing2 into main files.