Add first cut of j7 for CLAMR.