Initial work on datastore.types complete.
One more test.