made phaseplots in test
merged in phaseplot stuff
stuff