Started changes on math updates to r60
More work on math.