Created calculator class

Also, the error no longer invaids
Fixed Conflicts