forgot to merge in the feature spec

^