First piece of work on the feature.