added _resolve in datastore
idnumber can be a callable in DataStore.make
Merge branch 'superproblem'