cme work
More cme parsing updates.