Working on a new feature.
More work on a new feature.
Merged "feature" branch.