Moved over from calculator model to adding machine model