Prepare for multiple graphs

Rearranged graphing to admit multiple summaries.