Initial featureset is... mostly there