Begin reworking numerics