Doing some refactoring
Adding the rest of the mathfunctions
Small change
merging issues
Fixing merges