Added the GeneralMath class, amongst other things...
Merge.