Consolidated to main method, altered calc.jar, fixed expression test