Feature titles and descriptions, Refactor given cluster

Add scenarios from spec review
mark @pending and @discuss
Also copyright and spacing 2 replaces 4