So you got it working now? Which version did you use in the end? the version that utilizes the methods and private variables in the Calculator class? or the version that directly derives the answer from the Equals procedure?
Oh, and if it's solved, please remember to mark the thread as solved as well :P