Integrate main.pde and graph2.pde (and tweak calcIncrement())