merge with Paul
FeatureGrader - more specs