finished adding almost all datasources and graphics, need thresholds