Work-in-progress core data layer.

Change-Id: I822c3679e4e325294b4c1fe0d2e7a083121e1674