added a service for the calculator object and fixed up some logic