comment out test for OnOffSwitch
add constructor params to graphs