Trying numba and reorganized a bit.