More work on #10

Close #10 this time for real

Check everything, and make sure there are 1 or more stanzas