Added bits and bobs to the datastore definitions
Loads of stuff
Fixed merge conflicts