Finish up plots - closes #21. TEST!