A bit more of the math figured out