Updating DataStores

I will be updating datastores, one per commit as requested. I'll keep PR open and keep adding changes.
Ok, I'll fix this soon.