Fixing `client.request()` and making minor changes to `DataStore`; ready for major refactoring