First pass at new math done. Will add more text/polish soon (switching gears to the grid for an hour or two)