More plots-

Almost done now, need to clean up, check results, and move to separate
files