neat seperate package for calculations now