FeatureStore almost complete (other than some odds and ends)