Separated arithmetic concerns

Put code in class for fun