Reorganize some math things to be contiguous probably I guess
Reorganize some math things to be contiguous probably I guess