Need to add some stuff for plotting diagnostics...
Need to add some stuff for plotting diagnostics...