Work-in-progress core data layer.

Change-Id: Idfdc05099242e3ea441db00fb0e4aa7a983c0368