Working on something for the calculator