Starting moving calc functions into the class