Almost complete prototype of next-gen storage.

Change-Id: I0c3f53c548378918b7eb1282192cbeac8d7fc91c