Work-in-progress core data layer.

Change-Id: I1b896484965d0a23bc5593a329e8240df18bc065