Numeric class lattice reworking?