More FInishg touches on Core DAta, before NSFRC
More