OrderedMap class and tests, and changes to storage classes.
Still working on storage...