Start working on #7
Did total overkill on 3.1, #7
Reword
Reword again
Did another overkill on 3.2, \#7