Filled out datatype a little.
Work on the memory store, added some tests.