Changed FeatureStore to list of in memory Factsets

which dup code could we get rid of? (sorry)