Added more code to HandCalc