Continue to work on your calculators to make them behave how you expect a calculator behaves. I'll float around the class to help when you get stuck.
Extra Credit: With a simplistic implementation of this calculator, you can use the text configured on the buttons to retrieve the numbers and operations selected by the users. This starts to break down, however, when you introduce Japanese characters. How would you support internationalized versions?