Started working on the main storage datastructure.