New graphs + Cleanup graphing code chunks a little