Work-in-progress core data layer.

Change-Id: I02ff89ed23ac47f3cf96ad1f9362f420bcf8140c