consolidated graphcalc and apple calc