Going to merge this - we'll address custom datastore checking in #4